From: Cristy Date: Sat, 27 Jan 2018 19:17:00 +0000 (-0500) Subject: ... X-Git-Tag: 7.0.7-23~257 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7355d090b24d1cd500c7eadd1932816be3b30fd2;p=imagemagick ... --- diff --git a/coders/wbmp.c b/coders/wbmp.c index aa36ef6dc..abbb5f4d7 100644 --- a/coders/wbmp.c +++ b/coders/wbmp.c @@ -175,8 +175,6 @@ static Image *ReadWBMPImage(const ImageInfo *image_info, if (DiscardBlobBytes(image,image->offset) == MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - if (AcquireImageColormap(image,2,exception) == MagickFalse) - ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); if (image_info->ping != MagickFalse) { (void) CloseBlob(image); @@ -186,6 +184,8 @@ static Image *ReadWBMPImage(const ImageInfo *image_info, if (status == MagickFalse) return(DestroyImageList(image)); (void) SetImageBackgroundColor(image,exception); + if (AcquireImageColormap(image,2,exception) == MagickFalse) + ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); /* Convert bi-level image to pixel packets. */