diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-06-09 08:56:16 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-06-09 08:56:16 +0000 |
commit | 32fe9866f608c3ec221296b01a604210c298b54b (patch) | |
tree | 01190809788f64cd9d6e2221fb58ed9664d1183c | |
parent | 573060d3568338900141016ab2efff671a7a6f4d (diff) | |
download | gnunet-32fe9866f608c3ec221296b01a604210c298b54b.tar.gz gnunet-32fe9866f608c3ec221296b01a604210c298b54b.zip |
coverity fixes, revert to 11639 if broken
-rw-r--r-- | src/util/service.c | 9 |
1 files changed, 8 insertions, 1 deletions
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, | |||
790 | 790 | ||
791 | *addrs = NULL; | 791 | *addrs = NULL; |
792 | *addr_lens = NULL; | 792 | *addr_lens = NULL; |
793 | desc = NULL; | ||
793 | if (GNUNET_CONFIGURATION_have_value (cfg, | 794 | if (GNUNET_CONFIGURATION_have_value (cfg, |
794 | serviceName, "DISABLEV6")) | 795 | serviceName, "DISABLEV6")) |
795 | { | 796 | { |
@@ -823,6 +824,7 @@ GNUNET_SERVICE_get_server_addresses (const char *serviceName, | |||
823 | else | 824 | else |
824 | { | 825 | { |
825 | GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc)); | 826 | GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc)); |
827 | desc = NULL; | ||
826 | } | 828 | } |
827 | } | 829 | } |
828 | 830 | ||
@@ -879,7 +881,7 @@ GNUNET_SERVICE_get_server_addresses (const char *serviceName, | |||
879 | } | 881 | } |
880 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 882 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
881 | _ | 883 | _ |
882 | ("Disabling UNIX domainn socket support for service `%s', failed to create UNIX domain socket: %s\n"), | 884 | ("Disabling UNIX domain socket support for service `%s', failed to create UNIX domain socket: %s\n"), |
883 | serviceName, STRERROR (errno)); | 885 | serviceName, STRERROR (errno)); |
884 | GNUNET_free (unixpath); | 886 | GNUNET_free (unixpath); |
885 | unixpath = NULL; | 887 | unixpath = NULL; |
@@ -897,6 +899,9 @@ GNUNET_SERVICE_get_server_addresses (const char *serviceName, | |||
897 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 899 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
898 | _("Have neither PORT nor UNIXPATH for service `%s', but one is required\n"), | 900 | _("Have neither PORT nor UNIXPATH for service `%s', but one is required\n"), |
899 | serviceName); | 901 | serviceName); |
902 | if (desc != NULL) | ||
903 | GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc)); | ||
904 | GNUNET_free_non_null(hostname); | ||
900 | return GNUNET_SYSERR; | 905 | return GNUNET_SYSERR; |
901 | } | 906 | } |
902 | 907 | ||
@@ -1043,6 +1048,8 @@ GNUNET_SERVICE_get_server_addresses (const char *serviceName, | |||
1043 | GNUNET_free_non_null (unixpath); | 1048 | GNUNET_free_non_null (unixpath); |
1044 | *addrs = saddrs; | 1049 | *addrs = saddrs; |
1045 | *addr_lens = saddrlens; | 1050 | *addr_lens = saddrlens; |
1051 | if (desc != NULL) | ||
1052 | GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc)); | ||
1046 | return resi; | 1053 | return resi; |
1047 | } | 1054 | } |
1048 | 1055 | ||