Merge branch 'master' of git+ssh://git.gnunet.org/gnunet

1 files changed, 4 insertions, 0 deletions

diff --git a/src/json/json_helper.c b/src/json/json_helper.c
index 61257e62a..515cc4c7f 100644
--- a/src/json/json_helper.c
+++ b/src/json/json_helper.c
@@ -368,6 +368,8 @@ parse_object_const (void *cls,
                     json_t *root,
                     struct GNUNET_JSON_Specification *spec)
 {
+  if (NULL == root)
+    return GNUNET_OK;
   if (! json_is_object (root))
   {
     GNUNET_break_op (0);
@@ -409,6 +411,8 @@ parse_array_const (void *cls,
                    json_t *root,
                    struct GNUNET_JSON_Specification *spec)
 {
+  if (NULL == root)
+    return GNUNET_OK;
   if (! json_is_array (root))
   {
     GNUNET_break_op (0);