[GNUnet-SVN] r11956 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2010-06-25 19:34:57 +0200 (Fri, 25 Jun 2010)
New Revision: 11956

Modified:
   gnunet/src/util/service.c
Log:
leak

Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c   2010-06-25 17:09:22 UTC (rev 11955)
+++ gnunet/src/util/service.c   2010-06-25 17:34:57 UTC (rev 11956)
@@ -895,6 +895,11 @@
          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_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 @@
                       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_free_non_null (unixpath);
   *addrs = saddrs;
   *addr_lens = saddrlens;
-  if (desc != NULL)
-    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc));
   return resi;
 }