Merge branch 'master' of ssh://gnunet.org/gnunet

2 files changed, 11 insertions, 3 deletions

diff --git a/src/multicast/gnunet-service-multicast.c b/src/multicast/gnunet-service-multicast.c
index cf7dde913..b5be257d6 100644
--- a/src/multicast/gnunet-service-multicast.c
+++ b/src/multicast/gnunet-service-multicast.c
@@ -1448,6 +1448,12 @@ check_client_member_join (void *cls,
   uint16_t msg_size = ntohs (msg->header.size);
   struct GNUNET_PeerIdentity *relays = (struct GNUNET_PeerIdentity *) &msg[1];
   uint32_t relay_count = ntohl (msg->relay_count);
+
+  if (0 == relay_count}
+  {
+     GNUNET_break (0);
+    return GNUNET_SYSERR;
+  }
   if (UINT32_MAX / relay_count < sizeof (*relays)){
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                     "relay_count (%lu) * sizeof (*relays)  (%lu) exceeds UINT32_MAX!\n",
diff --git a/src/namecache/namecache_api.c b/src/namecache/namecache_api.c
index 2bb233da1..2a60a2813 100644
--- a/src/namecache/namecache_api.c
+++ b/src/namecache/namecache_api.c
@@ -483,9 +483,11 @@ GNUNET_NAMECACHE_block_cache (struct GNUNET_NAMECACHE_Handle *h,
 
   if (NULL == h->mq)
     return NULL;
-  blen = ntohl (block->purpose.size)
-    - sizeof (struct GNUNET_TIME_AbsoluteNBO)
-    - sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose);
+  blen = ntohl (block->purpose.size);
+  GNUNET_assert (blen > (sizeof (struct GNUNET_TIME_AbsoluteNBO) + 
+                         sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose)));
+  blen -= (sizeof (struct GNUNET_TIME_AbsoluteNBO) +
+           sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose));
   rid = get_op_id (h);
   qe = GNUNET_new (struct GNUNET_NAMECACHE_QueueEntry);
   qe->nsh = h;