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

[gnunet]

Author: nevans
Date: 2010-06-09 10:56:16 +0200 (Wed, 09 Jun 2010)
New Revision: 11643

Modified:
   gnunet/src/util/service.c
Log:
coverity fixes, revert to 11639 if broken

Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c   2010-06-09 08:14:38 UTC (rev 11642)
+++ gnunet/src/util/service.c   2010-06-09 08:56:16 UTC (rev 11643)
@@ -790,6 +790,7 @@
 
   *addrs = NULL;
   *addr_lens = NULL;
+  desc = NULL;
   if (GNUNET_CONFIGURATION_have_value (cfg,
                                        serviceName, "DISABLEV6"))
     {
@@ -823,6 +824,7 @@
       else
         {
           GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc));
+          desc = NULL;
         }
     }
 
@@ -879,7 +881,7 @@
             }
           GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                       _
-                      ("Disabling UNIX domainn socket support for service 
`%s', failed to create UNIX domain socket: %s\n"),
+                      ("Disabling UNIX domain socket support for service `%s', 
failed to create UNIX domain socket: %s\n"),
                       serviceName, STRERROR (errno));
          GNUNET_free (unixpath);
           unixpath = NULL;
@@ -897,6 +899,9 @@
       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;
     }
        
@@ -1043,6 +1048,8 @@
   GNUNET_free_non_null (unixpath);
   *addrs = saddrs;
   *addr_lens = saddrlens;
+  if (desc != NULL)
+    GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc));
   return resi;
 }