From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 25 May 2014 23:27:26 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2281
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f008fdcea6389206e36baf0f05c8999c7366f7b;p=imagemagick

---

diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index cbcae1bd5..678c5cfa4 100644
--- a/MagickCore/blob.c
+++ b/MagickCore/blob.c
@@ -723,7 +723,8 @@ MagickExport unsigned char *DetachBlob(BlobInfo *blob_info)
 %
 %  The format of the DiscardBlobBytes method is:
 %
-%      MagickBooleanType DiscardBlobBytes(Image *image,const size_t length)
+%      MagickBooleanType DiscardBlobBytes(Image *image,
+%        const MagickSizeType length)
 %
 %  A description of each parameter follows.
 %
@@ -3822,10 +3823,13 @@ MagickPrivate MagickBooleanType SetBlobExtent(Image *image,
           if (image->blob->synchronize != MagickFalse)
             {
               int
+                file,
                 status;
 
-              status=posix_fallocate(fileno(image->blob->file_info.file),offset,
-                extent-offset);
+              file=fileno(image->blob->file_info.file);
+              if (file == -1)
+                return(MagickFalse);
+              status=posix_fallocate(file,offset,extent-offset);
               if (status != 0)
                 return(MagickFalse);
             }
diff --git a/MagickCore/utility.c b/MagickCore/utility.c
index dedbfca6d..be9849b26 100644
--- a/MagickCore/utility.c
+++ b/MagickCore/utility.c
@@ -453,6 +453,7 @@ MagickExport unsigned char *Base64Decode(const char *source,size_t *length)
               decode=(unsigned char *) RelinquishMagickMemory(decode);
               return((unsigned char *) NULL);
             }
+          break;
         }
       }
     }
diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c
index c38de9a9a..596118938 100644
--- a/MagickCore/xml-tree.c
+++ b/MagickCore/xml-tree.c
@@ -1489,40 +1489,41 @@ static char *ParseEntities(char *xml,char **entities,int state)
           if (entities[i++] == (char *) NULL)
             xml++;
           else
-            {
-              /*
-                Found a match.
-              */
-              length=strlen(entities[i]);
-              entity=strchr(xml,';');
-              if ((length-1L) >= (size_t) (entity-xml))
-                {
-                  offset=(ssize_t) (xml-p);
-                  extent=(size_t) (offset+length+strlen(entity));
-                  if (p != q)
-                    p=(char *) ResizeQuantumMemory(p,extent,sizeof(*p));
-                  else
-                    {
-                      char
-                        *xml;
-
-                      xml=(char *) AcquireQuantumMemory(extent,sizeof(*xml));
-                      if (xml != (char *) NULL)
-                        {
-                          (void) CopyMagickString(xml,p,extent*sizeof(*xml));
-                          p=xml;
-                        }
-                    }
-                  if (p == (char *) NULL)
-                    ThrowFatalException(ResourceLimitFatalError,
-                      "MemoryAllocationFailed");
-                  xml=p+offset;
-                  entity=strchr(xml,';');
-                }
-              if (entity != (char *) NULL)
-                (void) CopyMagickMemory(xml+length,entity+1,strlen(entity));
-              (void) strncpy(xml,entities[i],length);
-            }
+            if (entities[i] != (char *) NULL)
+              {
+                /*
+                  Found a match.
+                */
+                length=strlen(entities[i]);
+                entity=strchr(xml,';');
+                if ((length-1L) >= (size_t) (entity-xml))
+                  {
+                    offset=(ssize_t) (xml-p);
+                    extent=(size_t) (offset+length+strlen(entity));
+                    if (p != q)
+                      p=(char *) ResizeQuantumMemory(p,extent,sizeof(*p));
+                    else
+                      {
+                        char
+                          *xml;
+
+                        xml=(char *) AcquireQuantumMemory(extent,sizeof(*xml));
+                        if (xml != (char *) NULL)
+                          {
+                            (void) CopyMagickString(xml,p,extent*sizeof(*xml));
+                            p=xml;
+                          }
+                      }
+                    if (p == (char *) NULL)
+                      ThrowFatalException(ResourceLimitFatalError,
+                        "MemoryAllocationFailed");
+                    xml=p+offset;
+                    entity=strchr(xml,';');
+                  }
+                if (entity != (char *) NULL)
+                  (void) CopyMagickMemory(xml+length,entity+1,strlen(entity));
+                (void) strncpy(xml,entities[i],length);
+              }
         }
       else
         if (((state == ' ') || (state == '*')) &&
diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index a1bb9188e..e877be875 100644
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -4935,8 +4935,7 @@ MagickExport Image *XImportImage(const ImageInfo *image_info,
   crop_info.height=0;
   root=XRootWindow(display,XDefaultScreen(display));
   target=(Window) NULL;
-  if ((image_info->filename != (char *) NULL) &&
-      (*image_info->filename != '\0'))
+  if (*image_info->filename != '\0')
     {
       if (LocaleCompare(image_info->filename,"root") == 0)
         target=root;
diff --git a/coders/psd.c b/coders/psd.c
index 97a2684bd..9c3946d26 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -1198,12 +1198,11 @@ static MagickStatusType ReadPSDLayers(Image *image,const ImageInfo *image_info,
           if ((count != 0) && (LocaleNCompare(type,"Lr16",4) == 0))
             size=GetPSDSize(psd_info,image);
           else
-            if (DiscardBlobBytes(image,size-(ssize_t) quantum-12) == MagickFalse)
+            if (DiscardBlobBytes(image,(MagickSizeType) size-quantum-12) == MagickFalse)
               ThrowFileException(exception,CorruptImageError,
                 "UnexpectedEndOfFile",image->filename);
         }
     }
-
   status=MagickTrue;
   if (size != 0)
     {