1 files changed, 9 insertions, 1 deletions

diff --git a/src/util/container_multihashmap32.c b/src/util/container_multihashmap32.c
index 016dbabcc..72940489e 100644
--- a/src/util/container_multihashmap32.c
+++ b/src/util/container_multihashmap32.c
@@ -265,11 +265,15 @@ GNUNET_CONTAINER_multihashmap32_iterate (struct GNUNET_CONTAINER_MultiHashMap32
         if (GNUNET_OK != it (it_cls,
                              e->key,
                              e->value))
+        {
+          GNUNET_assert (--map->next_cache_off < NEXT_CACHE_SIZE);      
           return GNUNET_SYSERR;
+        }
       }
       count++;
     }
   }
+  GNUNET_assert (--map->next_cache_off < NEXT_CACHE_SIZE);
   return count;
 }
 
@@ -567,9 +571,13 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (struct GNUNET_CONTAINER_MultiHashM
          (GNUNET_OK != it (it_cls,
                            key,
                            e->value)) )
-      return GNUNET_SYSERR;
+      {
+        GNUNET_assert (--map->next_cache_off < NEXT_CACHE_SIZE);
+        return GNUNET_SYSERR;
+      }
     count++;
   }
+  GNUNET_assert (--map->next_cache_off < NEXT_CACHE_SIZE);
   return count;
 }