[GNUnet-SVN] r12559 - in gnunet/src: core util

[gnunet]

Author: grothoff
Date: 2010-08-15 16:03:54 +0200 (Sun, 15 Aug 2010)
New Revision: 12559

Modified:
   gnunet/src/core/gnunet-service-core.c
   gnunet/src/util/pseudonym.c
Log:
nitpicks

Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2010-08-15 13:57:32 UTC (rev 
12558)
+++ gnunet/src/core/gnunet-service-core.c       2010-08-15 14:03:54 UTC (rev 
12559)
@@ -2279,7 +2279,7 @@
   pos = n->messages;
   while (pos != NULL) 
     {
-      if (pos->priority < min_prio)
+      if (pos->priority <= min_prio)
        {
          min_prio_entry = pos;
          min_prio_prev = prev;
@@ -2307,6 +2307,7 @@
            GNUNET_SERVER_receive_done (client, GNUNET_OK);
          return;
        }
+      GNUNET_assert (min_prio_entry != NULL);
       /* discard "min_prio_entry" */
 #if DEBUG_CORE
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,

Modified: gnunet/src/util/pseudonym.c
===================================================================
--- gnunet/src/util/pseudonym.c 2010-08-15 13:57:32 UTC (rev 12558)
+++ gnunet/src/util/pseudonym.c 2010-08-15 14:03:54 UTC (rev 12559)
@@ -244,12 +244,16 @@
       return GNUNET_SYSERR;
     }
   emsg = NULL;
+  *ns_name = NULL;
   if ( (GNUNET_OK != GNUNET_BIO_read_int32 (fileR, ranking)) ||
        (GNUNET_OK != GNUNET_BIO_read_string(fileR, "Read string error!", 
ns_name, 200)) ||
+       (NULL == *ns_name) ||
        (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_free_non_null (*ns_name);
+      *ns_name = NULL;
       GNUNET_break (GNUNET_OK == GNUNET_DISK_directory_remove (fn));
       GNUNET_free (fn);
       return GNUNET_SYSERR;
@@ -263,6 +267,8 @@
       GNUNET_break (GNUNET_OK == GNUNET_DISK_directory_remove (fn));
       GNUNET_CONTAINER_meta_data_destroy (*meta);
       *meta = NULL;
+      GNUNET_free_non_null (*ns_name);
+      *ns_name = NULL;
       GNUNET_free_non_null (emsg);
       GNUNET_free (fn);
       return GNUNET_SYSERR;