From 54ebd8d7629c2faa0c8fb0dc97967f31c759d2d2 Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 14 Jan 2014 01:14:23 +0000 Subject: [PATCH] --- MagickCore/draw.c | 1 + MagickCore/utility.c | 1 + MagickCore/widget.c | 1 + MagickWand/magick-property.c | 2 +- coders/pcd.c | 2 ++ 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/MagickCore/draw.c b/MagickCore/draw.c index 7b978ebf72..224c206f00 100644 --- 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 ee701b882b..f31f01457f 100644 --- 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 db0e9db53a..db56bf5811 100644 --- 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 281cf6639c..6ea87d8693 100644 --- 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 662cf15f61..62e16a98d3 100644 --- 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);