[GNUnet-SVN] r18142 - gnunet/src/ats

[gnunet]

Author: grothoff
Date: 2011-11-15 09:08:05 +0100 (Tue, 15 Nov 2011)
New Revision: 18142

Modified:
   gnunet/src/ats/ats_api_scheduling.c
   gnunet/src/ats/gnunet-service-ats_addresses.c
   gnunet/src/ats/gnunet-service-ats_scheduling.c
Log:
more asserts for 1903

Modified: gnunet/src/ats/ats_api_scheduling.c
===================================================================
--- gnunet/src/ats/ats_api_scheduling.c 2011-11-15 08:07:14 UTC (rev 18141)
+++ gnunet/src/ats/ats_api_scheduling.c 2011-11-15 08:08:05 UTC (rev 18142)
@@ -822,8 +822,9 @@
   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) ||

Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2011-11-15 08:07:14 UTC 
(rev 18141)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2011-11-15 08:08:05 UTC 
(rev 18142)
@@ -348,6 +348,7 @@
 {
   struct ATS_Address aa;
 
+  GNUNET_break (0 < strlen (plugin_name));
   aa.peer = *peer;
   aa.addr_len = plugin_addr_len;
   aa.addr = plugin_addr;

Modified: gnunet/src/ats/gnunet-service-ats_scheduling.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_scheduling.c      2011-11-15 08:07:14 UTC 
(rev 18141)
+++ gnunet/src/ats/gnunet-service-ats_scheduling.c      2011-11-15 08:08:05 UTC 
(rev 18142)
@@ -359,8 +359,8 @@
     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);