From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 15 Jan 2014 22:33:44 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2854
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d246fc57cf90dc0ac7addcd8192d5c013fce640;p=imagemagick

---

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 1521ba668..0c06ed522 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -686,8 +686,10 @@ static MagickBooleanType ClonePixelCacheRepository(
           clone_nexus[id],exception);
         if (pixels == (Quantum *) NULL)
           continue;
-        (void) memcpy(clone_nexus[id]->metacontent,cache_nexus[id]->metacontent,
-          length*sizeof(cache_nexus[id]->metacontent));
+        if (clone_nexus[id]->metacontent != (void *) NULL)
+          (void) memcpy(clone_nexus[id]->metacontent,
+            cache_nexus[id]->metacontent,length*
+            sizeof(cache_nexus[id]->metacontent));
         status=WritePixelCacheMetacontent(clone_info,clone_nexus[id],exception);
       }
     }
diff --git a/MagickCore/display.c b/MagickCore/display.c
index ddbeed7fb..c7869ddf5 100644
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -11591,6 +11591,8 @@ static MagickBooleanType XROIImage(Display *display,
     */
     state=DefaultState;
     command_type=NullCommand;
+    crop_info.x=0;
+    crop_info.y=0;
     (void) XMapWindow(display,windows->info.id);
     do
     {
diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index be8527d7d..ccb3d98c8 100644
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -1490,11 +1490,11 @@ MagickExport MagickBooleanType EqualizeImage(Image *image,
     progress;
 
   double
-    black[CompositePixelChannel],
+    black[CompositePixelChannel+1],
     *equalize_map,
     *histogram,
     *map,
-    white[CompositePixelChannel];
+    white[CompositePixelChannel+1];
 
   register ssize_t
     i;
@@ -1585,6 +1585,8 @@ MagickExport MagickBooleanType EqualizeImage(Image *image,
   }
   (void) ResetMagickMemory(equalize_map,0,(MaxMap+1)*GetPixelChannels(image)*
     sizeof(*equalize_map));
+  (void) ResetMagickMemory(black,0,sizeof(*black));
+  (void) ResetMagickMemory(white,0,sizeof(*white));
   number_channels=GetPixelChannels(image);
   for (i=0; i < (ssize_t) number_channels; i++)
   {
diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index 54691df4f..f4c77e39e 100644
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -2594,6 +2594,8 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
   image_view=AcquireVirtualCacheView(image,exception);
   morphology_view=AcquireAuthenticCacheView(morphology_image,exception);
   width=image->columns+kernel->width-1;
+  offset.x=0.0;
+  offset.y=0.0;
   switch (method)
   {
     case ConvolveMorphology:
diff --git a/MagickCore/property.c b/MagickCore/property.c
index 1e3608d5a..a1f0da48d 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -2173,7 +2173,7 @@ MagickExport const char *GetImageProperty(const Image *image,
     return((const char *)NULL); \
   }
 #define WarnNoImageInfoReturn(format,arg) \
-  if (image == (Image *) NULL ) { \
+  if (image_info == (ImageInfo *) NULL ) { \
     (void) ThrowMagickException(exception,GetMagickModule(),OptionWarning, \
         "NoImageInfoForProperty",format,arg); \
     return((const char *)NULL); \
diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 596b7fe5b..6f4160df3 100644
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -142,7 +142,8 @@ static inline Image *GetImageCache(const ImageInfo *image_info,const char *path,
   if (image != (Image *) NULL)
     return(image);
   read_info=CloneImageInfo(image_info);
-  (void) CopyMagickString(read_info->filename,path,MaxTextExtent);
+  if (path != (const char *) NULL)
+    (void) CopyMagickString(read_info->filename,path,MaxTextExtent);
   image=ReadImage(read_info,exception);
   read_info=DestroyImageInfo(read_info);
   if (image != (Image *) NULL)
diff --git a/MagickWand/script-token.c b/MagickWand/script-token.c
index 53bb2d113..62e7d0b98 100644
--- a/MagickWand/script-token.c
+++ b/MagickWand/script-token.c
@@ -364,12 +364,13 @@ WandExport MagickBooleanType GetScriptToken(ScriptTokenInfo *token_info)
     offset;
 
   /* EOF - no more tokens! */
+  if (token_info == (ScriptTokenInfo *) NULL)
+    return(MagickFalse);
   if (token_info->status != TokenStatusOK)
     {
       token_info->token[0]='\0';
       return(MagickFalse);
     }
-
   state=IN_WHITE;
   quote='\0';
   offset=0;
diff --git a/coders/ps.c b/coders/ps.c
index c5d2b0a4d..90c1e0a8a 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -502,6 +502,8 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
   (void) ResetMagickMemory(command,0,sizeof(command));
   cmyk=image_info->colorspace == CMYKColorspace ? MagickTrue : MagickFalse;
   (void) ResetMagickMemory(&hires_bounds,0,sizeof(hires_bounds));
+  columns=0;
+  rows=0;
   priority=0;
   rows=0;
   extent=0;
diff --git a/coders/txt.c b/coders/txt.c
index c4eaea0aa..93d3b4306 100644
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -454,6 +454,11 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
         green,
         red;
 
+      red=0.0;
+      green=0.0;
+      blue=0.0;
+      black=0.0;
+      alpha=0.0;
       for (x=0; x < (ssize_t) image->columns; x++)
       {
         if (ReadBlobString(image,text) == (char *) NULL)
diff --git a/coders/xwd.c b/coders/xwd.c
index b470262ab..d1b3c2218 100644
--- a/coders/xwd.c
+++ b/coders/xwd.c
@@ -439,9 +439,9 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 color=(color*65535UL)/green_mask;
               SetPixelGreen(image,ScaleShortToQuantum((unsigned short) color),
                 q);
+              color=(pixel >> blue_shift) & blue_mask;
               if (blue_mask != 0)
-                color=(pixel >> blue_shift) & blue_mask;
-              color=(color*65535UL)/blue_mask;
+                color=(color*65535UL)/blue_mask;
               SetPixelBlue(image,ScaleShortToQuantum((unsigned short) color),q);
               q+=GetPixelChannels(image);
             }