From 18a9b97ccf4867621620ac1d81c38f5d81e1f4c9 Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 2 Dec 2014 23:47:21 +0000 Subject: [PATCH] --- coders/psd.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/coders/psd.c b/coders/psd.c index 6334bc0ba..2efab1806 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -1709,10 +1709,16 @@ static Image *ReadPSDImage(const ImageInfo *image_info, } else { + size_t + number_colors; + /* Read PSD raster colormap. */ - if (AcquireImageColormap(image,(size_t) (length/3),exception) == MagickFalse) + number_colors=length/3; + if (number_colors > 65536) + ThrowReaderException(CorruptImageError,"ImproperImageHeader"); + if (AcquireImageColormap(image,number_colors,exception) == MagickFalse) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); for (i=0; i < (ssize_t) image->colors; i++) image->colormap[i].red=ScaleCharToQuantum((unsigned char) -- 2.40.0