(no commit message)

diff --git a/MagickCore/distribute-cache.c b/MagickCore/distribute-cache.c
index 31d6efabc209dd5a88db1773e3d1d595e27b8e29..35fd30d929e02b29f294e9b29e84f976cc585d7a 100644 (file)
--- 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);\r
   if (status == -1)\r
     {\r
+      CLOSE_SOCKET(client_socket);\r
       (void) ThrowMagickException(exception,GetMagickModule(),CacheError,\r
         "DistributedPixelCache","'%s'",hostname);\r
       return(-1);\r

diff --git a/coders/miff.c b/coders/miff.c
index 68825abfe5ea5c2a72bbaae27550b2ee84aca6de..8e8ea04290706e8a436eab370adffe66318c9e83 100644 (file)
--- 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))