From e108308084cdbcb4ba911fff41dfd18c65f0996c Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 15 Aug 2010 14:03:54 +0000 Subject: [PATCH] nitpicks --- src/core/gnunet-service-core.c | 3 ++- src/util/pseudonym.c | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c index 0fcc13015..2fc7a1350 100644 --- a/src/core/gnunet-service-core.c +++ b/src/core/gnunet-service-core.c @@ -2279,7 +2279,7 @@ handle_client_send (void *cls, 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 @@ handle_client_send (void *cls, 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, diff --git a/src/util/pseudonym.c b/src/util/pseudonym.c index af7168b6c..0cddba580 100644 --- a/src/util/pseudonym.c +++ b/src/util/pseudonym.c @@ -244,12 +244,16 @@ read_info (const struct GNUNET_CONFIGURATION_Handle *cfg, 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 @@ read_info (const struct GNUNET_CONFIGURATION_Handle *cfg, 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; -- 2.25.1