(no commit message)

diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index baf69b31e97ec02365fe112bb5c7543b551c8deb..e49dfddeec224537ebf1d79bc6389fb88cad8fec 100644 (file)
--- 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 1d42ca5e0137ca8863ae2fbe207ba89aded4b8ff..36a0ac44454da74327cb7b265b2ab43964a462ab 100644 (file)
--- 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 389bfb645f123c5092da1697ffbd1797dc443951..8c6d859c22236059dd8d631d568e51886feff460 100644 (file)
--- 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 955399a0552940c5e31d6e50782159ed7c98ddd3..e95cbeccb87744b8433110f37912efc9d681652a 100644 (file)
--- 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 5d69de62a93bce6a9fc4d5c0636fa48be9c9f97f..3b3889517ec3bea86c5f3cfb31d6bf6032af80f4 100644 (file)
--- 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 ca0c99f602270532bf74d2669e1e72fe4ceedf7f..19aeb83f66ca9bc34eb6883e1ab516006edd2364 100644 (file)
--- 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,