Merge branch 'master' into 4.x-releng

This commit is contained in:
Joris Vink 2020-08-26 09:20:20 +02:00
commit dc266fbadd

View File

@ -537,7 +537,7 @@ json_parse_object(struct kore_json *json, struct kore_json_item *object)
if (!item->parse(json, item))
goto cleanup;
key = NULL;
if (!json_consume_whitespace(json))
@ -608,7 +608,7 @@ json_parse_array(struct kore_json *json, struct kore_json_item *array)
if (!item->parse(json, item))
goto cleanup;
key = NULL;
if (!json_consume_whitespace(json))