- address coverity findings !coverity

3 files changed, 11 insertions, 6 deletions

diff --git a/src/namestore/gnunet-namestore-zonefile.c b/src/namestore/gnunet-namestore-zonefile.c
index ff3b2a565..8820dcdfa 100644
--- a/src/namestore/gnunet-namestore-zonefile.c
+++ b/src/namestore/gnunet-namestore-zonefile.c
@@ -405,7 +405,9 @@ parse (void *cls)
       if (NULL == next)
       {
         fprintf (stderr, "Error at line %u: %s\n", ln, token);
-        break;
+        ret = 1;
+        GNUNET_SCHEDULER_shutdown ();
+        return;
       }
       next[0] = '\0';
       next++;
@@ -493,7 +495,7 @@ parse (void *cls)
       {
         if (GNUNET_SYSERR == parse_ttl (token, &ttl))
         {
-          fprintf (stderr, _("Failed to parse $TTL\n"));
+          fprintf (stderr, _ ("Failed to parse $TTL\n"));
           ret = 1;
           GNUNET_SCHEDULER_shutdown ();
           return;
@@ -504,7 +506,7 @@ parse (void *cls)
       {
         if (GNUNET_SYSERR == parse_origin (token, origin))
         {
-          fprintf (stderr, _("Failed to parse $ORIGIN from %s\n"), token);
+          fprintf (stderr, _ ("Failed to parse $ORIGIN from %s\n"), token);
           ret = 1;
           GNUNET_SCHEDULER_shutdown ();
           return;
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index f6e53a340..d6154f0aa 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -614,7 +614,6 @@ display_record (const struct GNUNET_IDENTITY_PrivateKey *zone_key,
   const char *typestr;
   char *s;
   const char *ets;
-  struct GNUNET_IDENTITY_PublicKey pk;
   struct GNUNET_TIME_Absolute at;
   struct GNUNET_TIME_Relative rt;
   struct EgoEntry *ego;
@@ -651,8 +650,7 @@ display_record (const struct GNUNET_IDENTITY_PrivateKey *zone_key,
     return;
   if (! list_orphaned && is_orphaned)
     return;
-  GNUNET_IDENTITY_key_get_public (zone_key, &pk);
-  orphaned_str = GNUNET_IDENTITY_public_key_to_string (&pk);
+  orphaned_str = GNUNET_IDENTITY_private_key_to_string (zone_key);
   fprintf (stdout, "%s.%s:\n", rname, is_orphaned ? orphaned_str :
            ego->identifier);
   GNUNET_free (orphaned_str);
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index b3c077141..92c81c4eb 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -752,7 +752,11 @@ send_lookup_response_with_filter (struct NamestoreClient *nc,
     GNUNET_free (nick);
 
   if (0 == res_count)
+  {
+    if (rd_nf != res)
+      GNUNET_free (res);
     return 0;
+  }
   GNUNET_assert (-1 != GNUNET_GNSRECORD_records_get_size (res_count, res));
 
 
@@ -1573,6 +1577,7 @@ store_record_set (struct NamestoreClient *nc,
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Name `%s' does not exist, no deletion required\n",
                   conv_name);
+      res = GNUNET_NO;
       ec = GNUNET_EC_NAMESTORE_RECORD_NOT_FOUND;
     }
     else