...

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index eede406d1ee04e8e1721e60d3aa72142af3bba1d..ac0297336122b2feede9d4f436bdc5b6cf5a2e03 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -3520,7 +3520,8 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
       cache_info->type=PingCache;
       return(MagickTrue);
     }
-  status=AcquireMagickResource(AreaResource,cache_info->length);
+  status=AcquireMagickResource(AreaResource,(MagickSizeType) 
+    cache_info->columns*cache_info->rows);
   if (cache_info->mode == PersistMode)
     status=MagickFalse;
   length=number_pixels*(cache_info->number_channels*sizeof(Quantum)+

diff --git a/tests/wandtest.c b/tests/wandtest.c
index c11096cd941c55ab8659cfcc320e134da7c535e7..2ef07bf6c090c4ccc893ca7e322399fc3b6c2d11 100644 (file)
--- a/tests/wandtest.c
+++ b/tests/wandtest.c
@@ -5341,6 +5341,7 @@ int main(int argc,char **argv)
       primary_colors);
     if (status == MagickFalse)
       ThrowAPIException(magick_wand);
+    ResetMagickMemory(pixels,0,sizeof(pixels));
     status=MagickExportImagePixels(magick_wand,10,10,3,3,"RGB",CharPixel,
       pixels);
     if (status == MagickFalse)