From a44b400f34260627ca73e3463f1cdd6dd22e4821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= Date: Tue, 30 Dec 2014 20:05:25 +0100 Subject: [PATCH] Avoid a memory leak in quantum management Note that upstream magick/colormap-private.h patch is buggy and already applied in the patch queue. git-svn-id: https://subversion.imagemagick.org/subversion/ImageMagick/branches/ImageMagick-6@17207 aa41f4f7-0bf4-0310-aa73-e5a19afd5a74 origin: http://trac.imagemagick.org/changeset/17207 and http://trac.imagemagick.org/changeset/17228 --- magick/quantum.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/magick/quantum.c b/magick/quantum.c index a282a0e..d3bab0e 100644 --- a/magick/quantum.c +++ b/magick/quantum.c @@ -46,6 +46,7 @@ #include "magick/exception.h" #include "magick/exception-private.h" #include "magick/cache.h" +#include "magick/cache-private.h" #include "magick/constitute.h" #include "magick/delegate.h" #include "magick/geometry.h" @@ -144,7 +145,7 @@ MagickExport QuantumInfo *AcquireQuantumInfo(const ImageInfo *image_info, % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% AcquireQuantumPixels() allocates the unsigned char structure. +% AcquireQuantumPixels() allocates the pixel staging area. % % The format of the AcquireQuantumPixels method is: % @@ -179,7 +180,12 @@ static MagickBooleanType AcquireQuantumPixels(QuantumInfo *quantum_info, quantum_info->pixels[i]=(unsigned char *) AcquireQuantumMemory(extent+1, sizeof(**quantum_info->pixels)); if (quantum_info->pixels[i] == (unsigned char *) NULL) - return(MagickFalse); + { + while (--i >= 0) + quantum_info->pixels[i]=(unsigned char *) RelinquishMagickMemory( + quantum_info->pixels[i]); + return(MagickFalse); + } (void) ResetMagickMemory(quantum_info->pixels[i],0,(extent+1)* sizeof(**quantum_info->pixels)); quantum_info->pixels[i][extent]=QuantumSignature; -- 2.1.4