From 300c5ea037081c8e8f1009083876fbcbc8cb52ad Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 15 Nov 2011 08:08:05 +0000 Subject: more asserts for 1903 --- src/ats/ats_api_scheduling.c | 5 +++-- src/ats/gnunet-service-ats_addresses.c | 1 + src/ats/gnunet-service-ats_scheduling.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c index 999104979..ac4cca882 100644 --- a/src/ats/ats_api_scheduling.c +++ b/src/ats/ats_api_scheduling.c @@ -822,8 +822,9 @@ GNUNET_ATS_address_destroyed (struct GNUNET_ATS_SchedulingHandle *sh, size_t msize; uint32_t session_id; - GNUNET_break (address->transport_name != NULL); - namelen = (address->transport_name == NULL) ? 0 : strlen (address->transport_name) + 1; + GNUNET_assert (address->transport_name != NULL); + namelen = strlen (address->transport_name) + 1; + GNUNET_assert (namelen > 1); msize = sizeof (struct AddressDestroyedMessage) + address->address_length + namelen; if ((msize >= GNUNET_SERVER_MAX_MESSAGE_SIZE) || (address->address_length >= GNUNET_SERVER_MAX_MESSAGE_SIZE) || diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index ee76842b6..f4f9607e6 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c @@ -348,6 +348,7 @@ GAS_addresses_destroy (const struct GNUNET_PeerIdentity *peer, { struct ATS_Address aa; + GNUNET_break (0 < strlen (plugin_name)); aa.peer = *peer; aa.addr_len = plugin_addr_len; aa.addr = plugin_addr; diff --git a/src/ats/gnunet-service-ats_scheduling.c b/src/ats/gnunet-service-ats_scheduling.c index dac84676f..4659a2363 100644 --- a/src/ats/gnunet-service-ats_scheduling.c +++ b/src/ats/gnunet-service-ats_scheduling.c @@ -359,8 +359,8 @@ GAS_handle_address_destroyed (void *cls, struct GNUNET_SERVER_Client *client, GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); return; } - if ((plugin_name_length != 0) && - (plugin_name[plugin_name_length - 1] != '\0')) + if ( (plugin_name_length == 0) || + (plugin_name[plugin_name_length - 1] != '\0')) { GNUNET_break (0); GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); -- cgit v1.2.3