From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 18 May 2014 17:20:55 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2312
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5467fcf6dfee9d372efee47bb4eb1fb8f3e118b4;p=imagemagick

---

diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c
index 8fc693a82..2ba31dec6 100644
--- a/MagickCore/xml-tree.c
+++ b/MagickCore/xml-tree.c
@@ -1562,7 +1562,7 @@ static void ParseCharacterContent(XMLTreeRoot *root,char *xml,
     return;
   xml[length]='\0';
   xml=ParseEntities(xml,root->entities,state);
-  if (*xml_info->content != '\0')
+  if ((xml_info->content != (char *) NULL) && (*xml_info->content != '\0'))
     {
       (void) ConcatenateString(&xml_info->content,xml);
       xml=DestroyString(xml);
diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 95d8ba1f3..a9ec377c4 100644
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -3142,17 +3142,16 @@ MagickPrivate void XGetPixelInfo(Display *display,
   /*
     Set highlight color.
   */
-  pixel->highlight_color.red=(unsigned short) ((
+  pixel->highlight_color.red=(unsigned short) (((double) 
     pixel->matte_color.red*ScaleQuantumToShort(HighlightModulate))/65535L+
     (ScaleQuantumToShort((Quantum) (QuantumRange-HighlightModulate))));
-  pixel->highlight_color.green=(unsigned short) ((
+  pixel->highlight_color.green=(unsigned short) (((double) 
     pixel->matte_color.green*ScaleQuantumToShort(HighlightModulate))/65535L+
     (ScaleQuantumToShort((Quantum) (QuantumRange-HighlightModulate))));
-  pixel->highlight_color.blue=(unsigned short) ((
+  pixel->highlight_color.blue=(unsigned short) (((double) 
     pixel->matte_color.blue*ScaleQuantumToShort(HighlightModulate))/65535L+
     (ScaleQuantumToShort((Quantum) (QuantumRange-HighlightModulate))));
-  pixel->highlight_color.pixel=
-    XStandardPixel(map_info,&pixel->highlight_color);
+  pixel->highlight_color.pixel=XStandardPixel(map_info,&pixel->highlight_color);
   pixel->highlight_color.flags=(char) (DoRed | DoGreen | DoBlue);
   /*
     Set shadow color.
diff --git a/coders/icon.c b/coders/icon.c
index 7ea44afb5..6312744a7 100644
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -1334,11 +1334,11 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info,
       }
     if (GetNextImageInList(next) == (Image *) NULL)
       break;
-    next=SyncNextImageInList(next);
     status=SetImageProgress(next,SaveImagesTag,scene++,
       GetImageListLength(next));
     if (status == MagickFalse)
       break;
+    next=SyncNextImageInList(next);
   } while ((next != (Image *) NULL) && (image_info->adjoin != MagickFalse));
   offset=SeekBlob(image,0,SEEK_SET);
   (void) offset;
diff --git a/coders/miff.c b/coders/miff.c
index 7b37d1eac..61e432116 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -213,8 +213,9 @@ static void PushRunlengthPacket(Image *image,const unsigned char *pixels,
       {
         case 32:
         {
-          pixel->index=ConstrainColormapIndex(image,
-            (*p << 24) | (*(p+1) << 16) | (*(p+2) << 8) | *(p+3),exception);
+          pixel->index=ConstrainColormapIndex(image,((size_t) *p << 24) |
+            ((size_t) *(p+1) << 16) | ((size_t) *(p+2) << 8) | (size_t) *(p+3),
+            exception);
           p+=4;
           break;
         }