[GNUnet-SVN] r11725 - in gnunet/src: fs peerinfo-tool util

[gnunet]

Author: grothoff
Date: 2010-06-13 13:44:41 +0200 (Sun, 13 Jun 2010)
New Revision: 11725

Modified:
   gnunet/src/fs/gnunet-publish.c
   gnunet/src/peerinfo-tool/gnunet-peerinfo.c
   gnunet/src/util/pseudonym.c
   gnunet/src/util/service.c
Log:
fixes

Modified: gnunet/src/fs/gnunet-publish.c
===================================================================
--- gnunet/src/fs/gnunet-publish.c      2010-06-13 11:21:34 UTC (rev 11724)
+++ gnunet/src/fs/gnunet-publish.c      2010-06-13 11:44:41 UTC (rev 11725)
@@ -493,6 +493,8 @@
                   _("Failed to parse URI: %s\n"),
                   emsg);
          GNUNET_free (emsg);
+         if (namespace != NULL)
+           GNUNET_FS_namespace_delete (namespace, GNUNET_NO);
          GNUNET_FS_stop (ctx);
          ret = 1;
          return;         
@@ -507,6 +509,8 @@
                             GNUNET_FS_PUBLISH_OPTION_NONE,
                             &uri_ksk_continuation,
                             NULL);
+      if (namespace != NULL)
+       GNUNET_FS_namespace_delete (namespace, GNUNET_NO);
       return;
     }
   l = NULL;

Modified: gnunet/src/peerinfo-tool/gnunet-peerinfo.c
===================================================================
--- gnunet/src/peerinfo-tool/gnunet-peerinfo.c  2010-06-13 11:21:34 UTC (rev 
11724)
+++ gnunet/src/peerinfo-tool/gnunet-peerinfo.c  2010-06-13 11:44:41 UTC (rev 
11725)
@@ -204,6 +204,7 @@
       return;
     }
   GNUNET_HELLO_iterate_addresses (hello, GNUNET_NO, &print_address, pc);
+  GNUNET_free (pc);
 }
 
 

Modified: gnunet/src/util/pseudonym.c
===================================================================
--- gnunet/src/util/pseudonym.c 2010-06-13 11:21:34 UTC (rev 11724)
+++ gnunet/src/util/pseudonym.c 2010-06-13 11:44:41 UTC (rev 11725)
@@ -243,16 +243,17 @@
       GNUNET_free (fn);
       return GNUNET_SYSERR;
     }
+  emsg = NULL;
   if ( (GNUNET_OK != GNUNET_BIO_read_int32 (fileR, ranking)) ||
        (GNUNET_OK != GNUNET_BIO_read_string(fileR, "Read string error!", 
ns_name, 200)) ||
        (GNUNET_OK != GNUNET_BIO_read_meta_data(fileR, "Read meta data error!", 
meta)) )
     {
       GNUNET_BIO_read_close(fileR, &emsg);
+      GNUNET_free_non_null (emsg);
       GNUNET_break (GNUNET_OK == GNUNET_DISK_directory_remove (fn));
       GNUNET_free (fn);
       return GNUNET_SYSERR;
     }
-  emsg = NULL;
   if (GNUNET_OK != GNUNET_BIO_read_close(fileR, &emsg))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_WARNING,

Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c   2010-06-13 11:21:34 UTC (rev 11724)
+++ gnunet/src/util/service.c   2010-06-13 11:44:41 UTC (rev 11725)
@@ -877,6 +877,7 @@
               (errno == ENOMEM) || (errno == ENFILE) || (errno == EACCES))
             {
               GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
+             GNUNET_free_non_null (hostname);
               return GNUNET_SYSERR;
             }
           GNUNET_log (GNUNET_ERROR_TYPE_INFO,