(no commit message)

diff --git a/coders/psd.c b/coders/psd.c
index 7163c75aa754859be3a37091b5323c1a73d639c6..f515295c4ca43ec5dc0f8d6ede457eed4e8fae04 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -940,13 +940,31 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
           size_t
             quantum;
 
+          unsigned char
+            *blocks;
+
           /*
             Skip layers & masks.
           */
           quantum=psd_info.version == 1 ? 4UL : 8UL;
-          if (DiscardBlobBytes(image,length-quantum) == MagickFalse)
-            ThrowFileException(exception,CorruptImageError,
-              "UnexpectedEndOfFile",image->filename);
+          size=ReadBlobMSBLong(image);
+          length-=(quantum+4);
+          if (image->debug != MagickFalse)
+            (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+              "  reading image resource blocks - %.20g bytes",(double) length);
+          blocks=(unsigned char *) AcquireQuantumMemory((size_t) length,
+            sizeof(*blocks));
+          if (blocks == (unsigned char *) NULL)
+            ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+          count=ReadBlob(image,(size_t) length,blocks);
+          if ((count != (ssize_t) length) ||
+              (LocaleNCompare((char *) blocks,"8BIM",4) != 0))
+            {
+              blocks=(unsigned char *) RelinquishMagickMemory(blocks);
+              ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+            }
+          (void) ParseImageResourceBlocks(image,blocks,(size_t) length);
+          blocks=(unsigned char *) RelinquishMagickMemory(blocks);
         }
       else
         {