commit 4662a13513c15a6545b44bead832ebcbdcf522ca
author cristy <urban-warrior@git.imagemagick.org> Mon Jan 19 19:27:00 2015 +0000
committer cristy <urban-warrior@git.imagemagick.org> Mon Jan 19 19:27:00 2015 +0000
tree 78940fa7e5e093e0679f1b583f97e8982eb11077
parent e6472b75169947bd76c8508739f4ad5be6c72799

MagickCore/string.c

diff --git a/MagickCore/string.c b/MagickCore/string.c
index a84b56e..112018e 100644
--- a/MagickCore/string.c
+++ b/MagickCore/string.c
@@ -938,17 +938,14 @@
   if (destination == (char *) NULL)
     ThrowFatalException(ResourceLimitFatalError,"UnableToEscapeString");
   *destination='\0';
-  if (source != (char *) NULL)
-    {
-      q=destination;
-      for (p=source; *p != '\0'; p++)
-      {
-        if ((*p == '\\') || (*p == escape))
-          *q++='\\';
-        *q++=(*p);
-      }
-      *q='\0';
-    }
+  q=destination;
+  for (p=source; *p != '\0'; p++)
+  {
+    if ((*p == '\\') || (*p == escape))
+      *q++='\\';
+    *q++=(*p);
+  }
+  *q='\0';
   return(destination);
 }
 

MagickCore/xml-tree.c

diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c
index 067f881..112219c 100644
--- a/MagickCore/xml-tree.c
+++ b/MagickCore/xml-tree.c
@@ -2776,9 +2776,7 @@
   root=(XMLTreeRoot *) xml_info;
   while (root->root.parent != (XMLTreeInfo *) NULL)
     root=(XMLTreeRoot *) root->root.parent;
-  parent=(XMLTreeInfo *) NULL;
-  if (xml_info != (XMLTreeInfo *) NULL)
-    parent=xml_info->parent;
+  parent=xml_info->parent;
   if (parent == (XMLTreeInfo *) NULL)
     for (i=0; root->processing_instructions[i] != (char **) NULL; i++)
     {

coders/sun.c

diff --git a/coders/sun.c b/coders/sun.c
index 3f71a1e..b5fed9c 100644
--- a/coders/sun.c
+++ b/coders/sun.c
@@ -408,7 +408,7 @@
     if ((sun_info.length*sizeof(*sun_data))/sizeof(*sun_data) !=
         sun_info.length || !sun_info.length)
       ThrowReaderException(ResourceLimitError,"ImproperImageHeader");
-    number_pixels=(MagickSizeType) image->columns*image->rows;
+    number_pixels=(MagickSizeType) (image->columns*image->rows);
     if ((sun_info.type != RT_ENCODED) && 
         ((number_pixels*sun_info.depth) > (8*sun_info.length)))
       ThrowReaderException(CorruptImageError,"ImproperImageHeader");