]> granicus.if.org Git - imagemagick/commitdiff
https://github.com/ImageMagick/ImageMagick/issues/1323
authorCristy <urban-warrior@imagemagick.org>
Wed, 19 Sep 2018 21:42:10 +0000 (17:42 -0400)
committerCristy <urban-warrior@imagemagick.org>
Wed, 19 Sep 2018 21:42:10 +0000 (17:42 -0400)
ChangeLog
coders/pcx.c

index 96c0152d40c330bd0c0d70f21e3a3d1bb98443e3..93d75ef04409ae350f55a8b3ea979c1fed5a76cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 2018-09-16  7.0.8-12 Cristy  <quetzlzacatenango@image...>
-  * 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 <dirk@lem.....org>
   * Added support for arithmetic coding to the jpeg encoder:
index 98425258815f8e986b7120a7be1b484fdefb4841..b4779d33de03605577d81c8271c0874456da3a3c 100644 (file)
@@ -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));