From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 25 Jun 2010 17:34:57 +0000 (+0000)
Subject: leak
X-Git-Tag: initial-import-from-subversion-38251~21206
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c4d9942632bbe89b7e5315bc21d65e0e0cd2682f;p=oweals%2Fgnunet.git

leak
---

diff --git a/src/util/service.c b/src/util/service.c
index c169a9d37..cff701a3c 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -895,6 +895,11 @@ GNUNET_SERVICE_get_server_addresses (const char *serviceName,
 	  GNUNET_free (unixpath);
           unixpath = NULL;
         }
+      else
+	{
+          GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc));
+          desc = NULL;
+	}
     }
   else
     unixpath = NULL;
@@ -908,8 +913,6 @@ GNUNET_SERVICE_get_server_addresses (const char *serviceName,
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
 		  _("Have neither PORT nor UNIXPATH for service `%s', but one is required\n"),
 		  serviceName);
-      if (desc != NULL)
-        GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc));
       GNUNET_free_non_null(hostname);
       return GNUNET_SYSERR;
     }
@@ -943,8 +946,6 @@ GNUNET_SERVICE_get_server_addresses (const char *serviceName,
                       hostname, gai_strerror (ret));
           GNUNET_free (hostname);
 	  GNUNET_free (unixpath);
-	  if (desc != NULL)
-	    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc));
           return GNUNET_SYSERR;
         }
       next = res;
@@ -1071,8 +1072,6 @@ GNUNET_SERVICE_get_server_addresses (const char *serviceName,
   GNUNET_free_non_null (unixpath);
   *addrs = saddrs;
   *addr_lens = saddrlens;
-  if (desc != NULL)
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc));
   return resi;
 }