-add sanity check on local inputs, fix assertion

2 files changed, 10 insertions, 1 deletions

diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c
index c50406ada..6a4f58d1f 100644
--- a/src/dht/gnunet-service-dht_clients.c
+++ b/src/dht/gnunet-service-dht_clients.c
@@ -510,6 +510,15 @@ handle_dht_local_put (void *cls,
        (unsigned long) (size - sizeof(struct GNUNET_DHT_ClientPutMessage)),
        GNUNET_h2s (&dht_msg->key),
        (unsigned int) bd.type);
+  if (GNUNET_OK !=
+      GNUNET_BLOCK_check_block (GDS_block_context,
+                                bd.type,
+                                bd.data,
+                                bd.data_size))
+  {
+    GNUNET_break (0);
+    return;
+  }
   GNUNET_STATISTICS_update (GDS_stats,
                             "# PUT requests received from clients",
                             1,
diff --git a/src/dht/plugin_block_dht.c b/src/dht/plugin_block_dht.c
index 5b6841a98..3dd3dd792 100644
--- a/src/dht/plugin_block_dht.c
+++ b/src/dht/plugin_block_dht.c
@@ -240,7 +240,7 @@ block_plugin_dht_check_reply (
 
       GNUNET_assert (reply_block_size >= sizeof(struct GNUNET_MessageHeader));
       GNUNET_assert (reply_block_size == ntohs (msg->size));
-      GNUNET_assert (GNUNET_OK !=
+      GNUNET_assert (GNUNET_OK ==
                      GNUNET_HELLO_get_id (hello,
                                           &pid));
       GNUNET_CRYPTO_hash (&pid,