From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 7 Aug 2017 19:09:10 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/653
X-Git-Tag: 7.0.6-6~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a25fe5447bfb3a1918a2e9d595928e853b09d2e;p=imagemagick

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

diff --git a/coders/viff.c b/coders/viff.c
index 703035c03..3f971f9a2 100644
--- a/coders/viff.c
+++ b/coders/viff.c
@@ -511,6 +511,8 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
           ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
         max_packets=(size_t) (number_pixels*viff_info.number_data_bands);
       }
+    if ((bytes_per_pixel*max_packets) > GetBlobSize(image))
+      ThrowReaderException(CorruptImageError,"ImproperImageHeader");
     pixels=(unsigned char *) AcquireQuantumMemory(MagickMax(number_pixels,
       max_packets),bytes_per_pixel*sizeof(*pixels));
     if (pixels == (unsigned char *) NULL)
@@ -801,10 +803,12 @@ ModuleExport size_t RegisterVIFFImage(void)
   entry->decoder=(DecodeImageHandler *) ReadVIFFImage;
   entry->encoder=(EncodeImageHandler *) WriteVIFFImage;
   entry->magick=(IsImageFormatHandler *) IsVIFF;
+  entry->flags|=CoderDecoderSeekableStreamFlag;
   (void) RegisterMagickInfo(entry);
   entry=AcquireMagickInfo("VIFF","XV","Khoros Visualization image");
   entry->decoder=(DecodeImageHandler *) ReadVIFFImage;
   entry->encoder=(EncodeImageHandler *) WriteVIFFImage;
+  entry->flags|=CoderDecoderSeekableStreamFlag;
   (void) RegisterMagickInfo(entry);
   return(MagickImageCoderSignature);
 }