From: Cristy Date: Wed, 19 Sep 2018 21:42:10 +0000 (-0400) Subject: https://github.com/ImageMagick/ImageMagick/issues/1323 X-Git-Tag: 7.0.8-12~22 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fac6abc2e7d26ededf5f54c4349da115e7393d52;p=imagemagick https://github.com/ImageMagick/ImageMagick/issues/1323 --- diff --git a/ChangeLog b/ChangeLog index 96c0152d4..93d75ef04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ 2018-09-16 7.0.8-12 Cristy - * Release ImageMagick version 7.0.8-12, GIT revision 14810:8f613ec25:20180916. + * Release ImageMagick version 7.0.8-12, GIT revision 14810:8f613ec25:20180916 2018-09-15 7.0.8-12 Dirk Lemstra * Added support for arithmetic coding to the jpeg encoder: diff --git a/coders/pcx.c b/coders/pcx.c index 984252588..b4779d33d 100644 --- a/coders/pcx.c +++ b/coders/pcx.c @@ -406,10 +406,9 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception) if (HeapOverflowSanityCheck(pcx_packets, (size_t) pcx_info.planes) != MagickFalse) ThrowPCXException(CorruptImageError,"ImproperImageHeader"); pcx_packets=(size_t) pcx_packets*pcx_info.planes; - if ((size_t) (pcx_info.bits_per_pixel*pcx_info.planes*image->columns) > - (pcx_packets*8U)) + if ((size_t) (pcx_info.bits_per_pixel*pcx_info.planes*image->columns) > (pcx_packets*8U)) ThrowPCXException(CorruptImageError,"ImproperImageHeader"); - if ((MagickSizeType) (pcx_packets/10) > GetBlobSize(image)) + if ((MagickSizeType) (pcx_packets/12) > GetBlobSize(image)) ThrowPCXException(CorruptImageError,"ImproperImageHeader"); scanline=(unsigned char *) AcquireQuantumMemory(MagickMax(image->columns, pcx_info.bytes_per_line),MagickMax(pcx_info.planes,8)*sizeof(*scanline));