From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 31 Mar 2018 23:21:51 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.7-29~244
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ac7b60560e763e16e31d18ff16e69d3080ff14f5;p=imagemagick

...
---

diff --git a/coders/pcx.c b/coders/pcx.c
index 7fead1dc5..0c4593bfc 100644
--- a/coders/pcx.c
+++ b/coders/pcx.c
@@ -408,7 +408,7 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception)
     if ((MagickSizeType) (pcx_packets/8) > GetBlobSize(image))
       ThrowPCXException(CorruptImageError,"ImproperImageHeader");
     scanline=(unsigned char *) AcquireQuantumMemory(MagickMax(image->columns,
-      pcx_info.bytes_per_line),MagickMax(8,pcx_info.planes)*sizeof(*scanline));
+      pcx_info.bytes_per_line),MagickMax(pcx_info.planes,8)*sizeof(*scanline));
     pixel_info=AcquireVirtualMemory(pcx_packets,2*sizeof(*pixels));
     if ((scanline == (unsigned char *) NULL) ||
         (pixel_info == (MemoryInfo *) NULL))
@@ -420,7 +420,7 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception)
         ThrowPCXException(ResourceLimitError,"MemoryAllocationFailed");
       }
     (void) memset(scanline,0,(size_t) MagickMax(image->columns,
-      pcx_info.bytes_per_line)*MagickMax(8,pcx_info.planes)*sizeof(*scanline));
+      pcx_info.bytes_per_line)*MagickMax(pcx_info.planes,8)*sizeof(*scanline));
     pixels=(unsigned char *) GetVirtualMemoryBlob(pixel_info);
     (void) memset(pixels,0,(size_t) pcx_packets*(2*sizeof(*pixels)));
     /*