https://github.com/ImageMagick/ImageMagick/issues/677

diff --git a/coders/viff.c b/coders/viff.c
index 3f971f9a26f9531bfe237b3e49facb6141d9624a..cc632df8ad9566a4c0093b0d76a9002cd5435030 100644 (file)
--- a/coders/viff.c
+++ b/coders/viff.c
@@ -485,9 +485,6 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
     if ((image_info->ping != MagickFalse) && (image_info->number_scenes != 0))
       if (image->scene >= (image_info->scene+image_info->number_scenes-1))
         break;
-    status=SetImageExtent(image,image->columns,image->rows,exception);
-    if (status == MagickFalse)
-      return(DestroyImageList(image));
     /*
       Allocate VIFF pixels.
     */
@@ -513,6 +510,9 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
       }
     if ((bytes_per_pixel*max_packets) > GetBlobSize(image))
       ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+    status=SetImageExtent(image,image->columns,image->rows,exception);
+    if (status == MagickFalse)
+      return(DestroyImageList(image));
     pixels=(unsigned char *) AcquireQuantumMemory(MagickMax(number_pixels,
       max_packets),bytes_per_pixel*sizeof(*pixels));
     if (pixels == (unsigned char *) NULL)

diff --git a/config/policy.xml b/config/policy.xml
index 6330084a5ab033ddb328f6fee150a618d040c245..95aaac4e103a7eedd31e0805cd0720d2109b70c2 100644 (file)
--- a/config/policy.xml
+++ b/config/policy.xml
@@ -62,8 +62,8 @@
   <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
   <!-- <policy domain="resource" name="memory" value="2GiB"/> -->
   <!-- <policy domain="resource" name="map" value="4GiB"/> -->
-  <!-- <policy domain="resource" name="width" value="10MP"/> -->
-  <!-- <policy domain="resource" name="height" value="10MP"/> -->
+  <!-- <policy domain="resource" name="width" value="10KP"/> -->
+  <!-- <policy domain="resource" name="height" value="10KP"/> -->
   <!-- <policy domain="resource" name="area" value="100MP"/> -->
   <!-- <policy domain="resource" name="disk" value="16EiB"/> -->
   <!-- <policy domain="resource" name="file" value="768"/> -->