From: Cristy <urban-warrior@imagemagick.org>
Date: Thu, 8 Jun 2017 13:09:28 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/509
X-Git-Tag: 7.0.6-0~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e9728345edd0141b4724e54832103055a94708b8;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/509
---

diff --git a/coders/dpx.c b/coders/dpx.c
index fd32efb98..cb9870dad 100644
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -1117,7 +1117,11 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception)
         }
     }
   for ( ; offset < (MagickOffsetType) dpx.file.image_offset; offset++)
-    (void) ReadBlobByte(image);
+    if (ReadBlobByte(image) == EOF)
+      break;
+  if (EOFBlob(image) != MagickFalse)
+    ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
+      image->filename);
   if (image_info->ping != MagickFalse)
     {
       (void) CloseBlob(image);
@@ -1142,7 +1146,8 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception)
            offset=SeekBlob(image,data_offset,SEEK_SET);
          else
            for ( ; offset < data_offset; offset++)
-             (void) ReadBlobByte(image);
+             if (ReadBlobByte(image) == EOF)
+               break;
           if (offset != data_offset)
             ThrowReaderException(CorruptImageError,"UnableToReadImageData");
        }