From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 18 Apr 2014 17:10:21 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2445
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3216eb99bc9e5c5d003554881083db6463ae109;p=imagemagick

---

diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index baf69b31e..e49dfddee 100644
--- a/MagickCore/blob.c
+++ b/MagickCore/blob.c
@@ -1702,7 +1702,7 @@ MagickExport MagickBooleanType ImageToFile(Image *image,char *filename,
   buffer=(unsigned char *) RelinquishMagickMemory(buffer);
   if ((file == -1) || (i < length))
     {
-      if (file == -1)
+      if (file != -1)
         file=close(file);
       ThrowFileException(exception,BlobError,"UnableToWriteBlob",filename);
       return(MagickFalse);
diff --git a/MagickCore/distribute-cache.c b/MagickCore/distribute-cache.c
index 1d42ca5e0..36a0ac444 100644
--- a/MagickCore/distribute-cache.c
+++ b/MagickCore/distribute-cache.c
@@ -911,13 +911,13 @@ MagickExport void DistributePixelCacheServer(const int port,
       sizeof(one));
     if (status == -1)
       {
-        (void) close(status);
+        (void) close(server_socket);
         continue;
       }
     status=bind(server_socket,p->ai_addr,p->ai_addrlen);
     if (status == -1)
       {
-        (void) close(status);
+        (void) close(server_socket);
         continue;
       }
     break;
diff --git a/MagickCore/log.c b/MagickCore/log.c
index 389bfb645..8c6d859c2 100644
--- a/MagickCore/log.c
+++ b/MagickCore/log.c
@@ -743,6 +743,8 @@ MagickExport MagickBooleanType ListLogInfo(FILE *file,ExceptionInfo *exception)
           size_t
             mask;
 
+          if (LogHandlers[j].name == (const char *) NULL)
+            break;
           mask=1;
           mask<<=j;
           if ((log_info[i]->handler_mask & mask) != 0)
@@ -750,8 +752,6 @@ MagickExport MagickBooleanType ListLogInfo(FILE *file,ExceptionInfo *exception)
               (void) FormatLocaleFile(file,"%s ",LogHandlers[j].name);
               length+=strlen(LogHandlers[j].name);
             }
-          if (LogHandlers[j].name == (const char *) NULL)
-            break;
         }
         for (j=(ssize_t) length; j <= 12; j++)
           (void) FormatLocaleFile(file," ");
diff --git a/coders/dcm.c b/coders/dcm.c
index 955399a05..e95cbeccb 100644
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -3564,7 +3564,10 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception)
         tag=(ReadBlobLSBShort(image) << 16) | ReadBlobLSBShort(image);
         length=(size_t) ReadBlobLSBLong(image);
         if (tag == 0xFFFEE0DD)
-          break; /* sequence delimiter tag */
+          {
+            (void) fclose(file);
+            break; /* sequence delimiter tag */
+          }
         if (tag != 0xFFFEE000)
           {
             (void) fclose(file);
diff --git a/coders/fits.c b/coders/fits.c
index 5d69de62a..3b3889517 100644
--- a/coders/fits.c
+++ b/coders/fits.c
@@ -333,8 +333,8 @@ static Image *ReadFITSImage(const ImageInfo *image_info,
         keyword[i]=tolower((int) ((unsigned char) keyword[i]));
       }
       keyword[i]='\0';
-      (void) ResetMagickMemory(value,0,sizeof(value));
       count=ReadBlob(image,72,(unsigned char *) value);
+      value[72]='\0';
       if (count != 72)
         break;
       p=value;
diff --git a/coders/pict.c b/coders/pict.c
index ca0c99f60..19aeb83f6 100644
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -1372,6 +1372,8 @@ static Image *ReadPICTImage(const ImageInfo *image_info,
           file=fdopen(unique_file,"wb");
         if ((unique_file == -1) || (file == (FILE *) NULL))
           {
+            if (file != (FILE *) NULL)
+              (void) fclose(file);
             (void) CopyMagickString(image->filename,read_info->filename,
               MaxTextExtent);
             ThrowFileException(exception,FileOpenError,