From 32fe9866f608c3ec221296b01a604210c298b54b Mon Sep 17 00:00:00 2001 From: "Nathan S. Evans" Date: Wed, 9 Jun 2010 08:56:16 +0000 Subject: coverity fixes, revert to 11639 if broken --- src/util/service.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/util/service.c b/src/util/service.c index 9ab99de3e..ee1a3151f 100644 --- a/src/util/service.c +++ b/src/util/service.c @@ -790,6 +790,7 @@ GNUNET_SERVICE_get_server_addresses (const char *serviceName, *addrs = NULL; *addr_lens = NULL; + desc = NULL; if (GNUNET_CONFIGURATION_have_value (cfg, serviceName, "DISABLEV6")) { @@ -823,6 +824,7 @@ GNUNET_SERVICE_get_server_addresses (const char *serviceName, else { GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc)); + desc = NULL; } } @@ -879,7 +881,7 @@ GNUNET_SERVICE_get_server_addresses (const char *serviceName, } 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_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; } @@ -1043,6 +1048,8 @@ 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; } -- cgit v1.2.3