]> granicus.if.org Git - imagemagick/commitdiff
Added check for missing data.
authordirk <dirk@git.imagemagick.org>
Mon, 29 Aug 2016 10:18:00 +0000 (12:18 +0200)
committerdirk <dirk@git.imagemagick.org>
Mon, 29 Aug 2016 10:18:00 +0000 (12:18 +0200)
coders/psd.c

index 640349932f6b83ef05254919bf73f47ca7f24ee9..f832a4b6272f1831ba2aadb3c1f8f4bea32b4353 100644 (file)
@@ -2032,11 +2032,13 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
           return((Image *) NULL);
         }
     }
-  if ((has_merged_image == MagickFalse) && (GetImageListLength(image) > 1))
+  if (has_merged_image == MagickFalse)
     {
       Image
         *merged;
 
+      if (GetImageListLength(image) == 1)
+        ThrowReaderException(CorruptImageError,"InsufficientImageDataInFile");
       SetImageAlphaChannel(image,TransparentAlphaChannel,exception);
       image->background_color.alpha=TransparentAlpha;
       image->background_color.alpha_trait=BlendPixelTrait;