From: dirk <dirk@git.imagemagick.org>
Date: Thu, 8 Oct 2015 20:47:31 +0000 (+0200)
Subject: Fix for accessing subimage in a photoshop layer.
X-Git-Tag: 7.0.1-0~571
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af51eabcc6704679f11425566462f51d1a46e435;p=imagemagick

Fix for accessing subimage in a photoshop layer.
---

diff --git a/coders/tiff.c b/coders/tiff.c
index 6616533fc..30267de09 100755
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1077,7 +1077,6 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
     tiff_status;
 
   MagickBooleanType
-    debug,
     status;
 
   MagickSizeType
@@ -1163,32 +1162,35 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
       image=DestroyImageList(image);
       return((Image *) NULL);
     }
-  debug=IsEventLogging();
-  (void) debug;
   if (image_info->number_scenes != 0)
     {
       /*
         Generate blank images for subimage specification (e.g. image.tif[4].
+        We need to check the number of directores because it is possible that
+        the subimage(s) are stored in the photoshop profile.
       */
-      for (i=0; i < (ssize_t) image_info->scene; i++)
-      {
-        status=TIFFReadDirectory(tiff) != 0 ? MagickTrue : MagickFalse;
-        if (status == MagickFalse)
-          {
-            TIFFClose(tiff);
-            image=DestroyImageList(image);
-            return((Image *) NULL);
-          }
-        AcquireNextImage(image_info,image,exception);
-        if (GetNextImageInList(image) == (Image *) NULL)
+      if (image_info->scene < (size_t) TIFFNumberOfDirectories(tiff))
+        {
+          for (i=0; i < (ssize_t) image_info->scene; i++)
           {
-            TIFFClose(tiff);
-            image=DestroyImageList(image);
-            return((Image *) NULL);
+            status=TIFFReadDirectory(tiff) != 0 ? MagickTrue : MagickFalse;
+            if (status == MagickFalse)
+              {
+                TIFFClose(tiff);
+                image=DestroyImageList(image);
+                return((Image *) NULL);
+              }
+            AcquireNextImage(image_info,image,exception);
+            if (GetNextImageInList(image) == (Image *) NULL)
+              {
+                TIFFClose(tiff);
+                image=DestroyImageList(image);
+                return((Image *) NULL);
+              }
+            image=SyncNextImageInList(image);
           }
-        image=SyncNextImageInList(image);
       }
-    }
+  }
   do
   {
 DisableMSCWarning(4127)
@@ -2105,6 +2107,15 @@ RestoreMSCWarning
   (void) TIFFSetErrorHandler(error_handler);
   TIFFClose(tiff);
   TIFFReadPhotoshopLayers(image,image_info,exception);
+  if (image_info->number_scenes != 0)
+    {
+      if (image_info->scene >= GetImageListLength(image))
+        {
+          /* Subimage was not found in the Photoshop layer */
+          image=DestroyImageList(image);
+          return((Image *)NULL);
+        }
+    }
   return(GetFirstImageInList(image));
 }
 #endif