From: dirk <dirk@git.imagemagick.org>
Date: Mon, 29 Aug 2016 10:18:00 +0000 (+0200)
Subject: Added check for missing data.
X-Git-Tag: 7.0.3-0~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4db8726a9197834311cf59e59de4693e2d95e867;p=imagemagick

Added check for missing data.
---

diff --git a/coders/psd.c b/coders/psd.c
index 640349932..f832a4b62 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -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;