diff options
| author | Cristy <urban-warrior@imagemagick.org> | 2017-08-15 09:03:42 -0400 |
|---|---|---|
| committer | Cristy <urban-warrior@imagemagick.org> | 2017-08-15 09:03:42 -0400 |
| commit | 29a9954ef1f6575231eb65e624587bdb182714d1 (patch) | |
| tree | 5fd0f169e4ba49b11a23d1760d91769aacd4131b | |
| parent | a26d35af096de6cda7988276cd5307f9d21c5bca (diff) | |
| download | ImageMagick-29a9954ef1f6575231eb65e624587bdb182714d1.tar.gz | |
https://github.com/ImageMagick/ImageMagick/issues/677
| -rw-r--r-- | coders/viff.c | 6 | ||||
| -rw-r--r-- | config/policy.xml | 4 |
2 files changed, 5 insertions, 5 deletions
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 @@ <!-- <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"/> --> |