From 7dd98f2b11fd2a2f5c2212b973243d26c4387b29 Mon Sep 17 00:00:00 2001
From: Martin Schanzenbach <mschanzenbach@posteo.de>
Date: Mon, 11 Jun 2012 12:35:36 +0000
Subject: [PATCH] -coverity, cleanup

---
 src/gns/gnunet-gns-proxy.c  | 12 ++++++------
 src/gns/nss/nss_gns_query.c | 24 ++++++++++++++++++------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index 9365295e4..fcfe2c762 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -1040,10 +1040,12 @@ process_get_authority (void *cls,
                 "Get authority failed!\n");
     strcpy (ctask->authority, "");
   }
-
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Get authority yielded %s\n", auth_name);
-  strcpy (ctask->authority, auth_name);
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Get authority yielded %s\n", auth_name);
+    strcpy (ctask->authority, auth_name);
+  }
 
   GNUNET_GNS_lookup_zone (gns_handle,
                           ctask->host,
@@ -1615,11 +1617,9 @@ generate_gns_certificate (const char *name)
 
   int ret;
   unsigned int serial;
-  unsigned int bits;
   size_t key_buf_size;
   size_t cert_buf_size;
   gnutls_x509_crt_t request;
-  gnutls_x509_privkey_t rsa;
   time_t etime;
   struct tm *tm_data;
 
diff --git a/src/gns/nss/nss_gns_query.c b/src/gns/nss/nss_gns_query.c
index ab88d22cb..1eadff0ce 100644
--- a/src/gns/nss/nss_gns_query.c
+++ b/src/gns/nss/nss_gns_query.c
@@ -46,19 +46,31 @@ int gns_resolve_name(int af, const char *name, struct userdata *u)
         line[strlen(line)-1] = '\0';
         if (af == AF_INET)
         {
-          inet_pton(af, line, &(u->data.ipv4[u->count++]));
-          u->data_len += sizeof(ipv4_address_t);
+          if (inet_pton(af, line, &(u->data.ipv4[u->count++])))
+            u->data_len += sizeof(ipv4_address_t);
+          else
+          {
+            fclose (p);
+            free (cmd);
+            return -1;
+          }
         }
         else if ((af == AF_INET6))
         {
-          inet_pton(af, line, &(u->data.ipv6[u->count++]));
-          u->data_len += sizeof(ipv6_address_t);
+          if (inet_pton(af, line, &(u->data.ipv6[u->count++])))
+            u->data_len += sizeof(ipv6_address_t);
+          else
+          {
+            fclose (p);
+            free (cmd);
+            return -1;
+          }
         }
       }
     }
+    fclose (p);
   }
-  fclose(p);
-  free(cmd);
+  free (cmd);
 
   return 0;
 
-- 
2.25.1