From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 28 Dec 2014 19:27:24 +0000 (+0000)
Subject: http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=26789
X-Git-Tag: 7.0.1-0~1528
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdc73bd6d6dcd7ccb156530a096ee739cd9e9a27;p=imagemagick

http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=26789
---

diff --git a/coders/cin.c b/coders/cin.c
index 81c9b8f29..e64afacf4 100644
--- a/coders/cin.c
+++ b/coders/cin.c
@@ -712,8 +712,6 @@ static Image *ReadCINImage(const ImageInfo *image_info,ExceptionInfo *exception)
       (void) SetImageProfile(image,"dpx:user.data",profile,exception);
       profile=DestroyStringInfo(profile);
     }
-  for ( ; offset < (MagickOffsetType) cin.file.image_offset; offset++)
-    (void) ReadBlobByte(image);
   image->depth=cin.image.channel[0].bits_per_pixel;
   image->columns=cin.image.channel[0].pixels_per_line;
   image->rows=cin.image.channel[0].lines_per_image;
@@ -722,6 +720,17 @@ static Image *ReadCINImage(const ImageInfo *image_info,ExceptionInfo *exception)
       (void) CloseBlob(image);
       return(image);
     }
+  for ( ; offset < (MagickOffsetType) cin.file.image_offset; offset++)
+  {
+    int
+      c;
+
+    c=ReadBlobByte(image);
+    if (c == EOF)
+      break;
+  }
+  if (offset < (MagickOffsetType) cin.file.image_offset)
+    ThrowReaderException(CorruptImageError,"ImproperImageHeader");
   status=SetImageExtent(image,image->columns,image->rows,exception);
   if (status == MagickFalse)
     return(DestroyImageList(image));