1 files changed, 6 insertions, 1 deletions

diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c
index f2c291784..8f9fbba65 100644
--- a/src/fs/fs_uri.c
+++ b/src/fs/fs_uri.c
@@ -1091,8 +1091,13 @@ GNUNET_FS_uri_dup (const struct GNUNET_FS_Uri *uri)
   switch (ret->type)
     {
     case ksk:
+      if (ret->data.ksk.keywordCount >= GNUNET_MAX_MALLOC_CHECKED / sizeof (char*))
+        {
+          GNUNET_break (0);
+          return NULL;
+        }
       if (ret->data.ksk.keywordCount > 0)
-        {
+        {         
           ret->data.ksk.keywords
             = GNUNET_malloc (ret->data.ksk.keywordCount * sizeof (char *));
           for (i = 0; i < ret->data.ksk.keywordCount; i++)