From: Cristy Date: Tue, 15 Aug 2017 13:03:42 +0000 (-0400) Subject: https://github.com/ImageMagick/ImageMagick/issues/677 X-Git-Tag: 7.0.6-8~15 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29a9954ef1f6575231eb65e624587bdb182714d1;p=imagemagick https://github.com/ImageMagick/ImageMagick/issues/677 --- diff --git a/coders/viff.c b/coders/viff.c index 3f971f9a2..cc632df8a 100644 --- 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 6330084a5..95aaac4e1 100644 --- a/config/policy.xml +++ b/config/policy.xml @@ -62,8 +62,8 @@ - - + +