1 files changed, 8 insertions, 1 deletions

diff --git a/src/lib/util/strings.c b/src/lib/util/strings.c
index 8498e74d3..f3ef0483d 100644
--- a/src/lib/util/strings.c
+++ b/src/lib/util/strings.c
@@ -1198,14 +1198,21 @@ GNUNET_STRINGS_parse_socket_addr (const char *addr,
  * freed with a single call to GNUNET_free();
  */
 static char *const *
-_make_continuous_arg_copy (int argc, char *const *argv)
+_make_continuous_arg_copy (int argc,
+                           char *const *argv)
 {
   size_t argvsize = 0;
   char **new_argv;
   char *p;
 
   for (int i = 0; i < argc; i++)
+  {
+    size_t ail = strlen (argv[i]);
+
+    GNUNET_assert (SIZE_MAX - 1 - sizeof (char *) > argvsize);
+    GNUNET_assert (SIZE_MAX - ail > argvsize + 1 + sizeof (char*));
     argvsize += strlen (argv[i]) + 1 + sizeof(char *);
+  }
   new_argv = GNUNET_malloc (argvsize + sizeof(char *));
   p = (char *) &new_argv[argc + 1];
   for (int i = 0; i < argc; i++)