(no commit message)

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 7b978ebf723197c72267b95620e915d10b1ffcc1..224c206f00055f4b603e091731d6b7b4d7dbc0a8 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -5280,6 +5280,7 @@ static size_t TracePath(PrimitiveInfo *primitive_info,const char *path)
   start.y=0.0;
   number_coordinates=0;
   z_count=0;
+  (void) ResetMagickMemory(points,0,sizeof(*points));
   primitive_type=primitive_info->primitive;
   q=primitive_info;
   for (p=path; *p != '\0'; )

diff --git a/MagickCore/utility.c b/MagickCore/utility.c
index ee701b882b92c6f9f3304bdfe12f4eb04456cd9c..f31f01457f7ad7ddcd762e787c70c9fb29bf2373 100644 (file)
--- a/MagickCore/utility.c
+++ b/MagickCore/utility.c
@@ -776,6 +776,7 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments,
     *path='\0';
     *filename='\0';
     *subimage='\0';
+    number_files=0;
     vector[count++]=ConstantString(option);
     destroy=MagickTrue;
     parameters=ParseCommandOption(MagickCommandOptions,MagickFalse,option);

diff --git a/MagickCore/widget.c b/MagickCore/widget.c
index db0e9db53a4b744020eb1020ebfae572956bc1b0..db56bf5811c71a6d69ec4d493c20c687ddae57a4 100644 (file)
--- a/MagickCore/widget.c
+++ b/MagickCore/widget.c
@@ -1788,6 +1788,7 @@ MagickPrivate void XColorBrowserWidget(Display *display,XWindows *windows,
   /*
     Respond to X events.
   */
+  XGetWidgetInfo((char *) NULL,&mode_info);
   XGetWidgetInfo((char *) NULL,&slider_info);
   XGetWidgetInfo((char *) NULL,&north_info);
   XGetWidgetInfo((char *) NULL,&south_info);

diff --git a/MagickWand/magick-property.c b/MagickWand/magick-property.c
index 281cf6639cbbe18010d3a5fce6f89cd30f56b65c..6ea87d8693fffd497d450d2fea35f3414bea0eb5 100644 (file)
--- a/MagickWand/magick-property.c
+++ b/MagickWand/magick-property.c
@@ -1555,7 +1555,7 @@ WandExport double *MagickGetSamplingFactors(MagickWand *wand,
       p++;
     i++;
   }
-  sampling_factors=(double *) AcquireQuantumMemory((size_t) i,
+  sampling_factors=(double *) AcquireQuantumMemory((size_t) i+1,
     sizeof(*sampling_factors));
   if (sampling_factors == (double *) NULL)
     ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed",

diff --git a/coders/pcd.c b/coders/pcd.c
index 662cf15f61c79a34dca1995b6f464dc3cb9d3831..62e16a98d3cfc1a1c66bff902e422e1a29a3e0b1 100644 (file)
--- a/coders/pcd.c
+++ b/coders/pcd.c
@@ -190,6 +190,8 @@ static MagickBooleanType DecodeImage(Image *image,unsigned char *luma,
   sum=0;
   bits=32;
   p=buffer+0x800;
+  for (i=0; i < 3; i++)
+    pcd_table[i]=(PCDTable *) NULL;
   for (i=0; i < (image->columns > 1536 ? 3 : 1); i++)
   {
     PCDGetBits(8);