-handle corner cases in JSON parser, lift 1kb restriction

1 files changed, 10 insertions, 1 deletions

diff --git a/src/json/json_helper.c b/src/json/json_helper.c
index 6189b7596..03db9ec80 100644
--- a/src/json/json_helper.c
+++ b/src/json/json_helper.c
@@ -125,7 +125,7 @@ parse_variable_data (void *cls,
     return GNUNET_SYSERR;
   }
   size = (strlen (str) * 5) / 8;
-  if (size >= 1024)
+  if (size >= GNUNET_MAX_MALLOC_CHECKED)
   {
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
@@ -135,6 +135,15 @@ parse_variable_data (void *cls,
                                        strlen (str),
                                        data,
                                        size);
+  if ( (0 < size) &&
+       (GNUNET_OK != res) )
+  {
+    size--;
+    res = GNUNET_STRINGS_string_to_data (str,
+                                         strlen (str),
+                                         data,
+                                         size);
+  }
   if (GNUNET_OK != res)
   {
     GNUNET_break_op (0);