From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 19 Jan 2015 12:04:57 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1412
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6472b75169947bd76c8508739f4ad5be6c72799;p=imagemagick

---

diff --git a/MagickCore/distribute-cache.c b/MagickCore/distribute-cache.c
index 31d6efabc..35fd30d92 100644
--- a/MagickCore/distribute-cache.c
+++ b/MagickCore/distribute-cache.c
@@ -232,6 +232,7 @@ static int ConnectPixelCacheServer(const char *hostname,const int port,
   status=connect(client_socket,result->ai_addr,(socklen_t) result->ai_addrlen);
   if (status == -1)
     {
+      CLOSE_SOCKET(client_socket);
       (void) ThrowMagickException(exception,GetMagickModule(),CacheError,
         "DistributedPixelCache","'%s'",hostname);
       return(-1);
diff --git a/coders/miff.c b/coders/miff.c
index 68825abfe..8e8ea0429 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -2023,7 +2023,6 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
       packet_size+=quantum_info->depth/8;
     if (compression == RLECompression)
       packet_size++;
-    length=image->columns;
     length=MagickMax(BZipMaxExtent(packet_size*image->columns),ZipMaxExtent(
       packet_size*image->columns));
     if ((compression == BZipCompression) || (compression == ZipCompression))