From 202b4674243a4a4826c35ed4d089831985c47256 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sat, 20 Feb 2016 23:32:59 +0200 Subject: [PATCH] lib: json_parse_next_stream() wrongly returned -1 even when a stream was returned. --- src/lib/json-parser.c | 2 +- src/lib/test-json-parser.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/json-parser.c b/src/lib/json-parser.c index 4a159bf412..fe54a19cdf 100644 --- a/src/lib/json-parser.c +++ b/src/lib/json-parser.c @@ -639,7 +639,7 @@ json_try_parse_stream_start(struct json_parser *parser, json_strinput_destroyed, parser); *input_r = parser->strinput; - return 1; + return 0; } int json_parse_next_stream(struct json_parser *parser, diff --git a/src/lib/test-json-parser.c b/src/lib/test-json-parser.c index ac7ee8ec8d..5b58eacb11 100644 --- a/src/lib/test-json-parser.c +++ b/src/lib/test-json-parser.c @@ -140,7 +140,7 @@ static void test_json_parser_success(bool full_size) } else { ret = jsoninput != NULL ? 1 : json_parse_next_stream(parser, &jsoninput); - if (jsoninput != NULL) + if (ret > 0 && jsoninput != NULL) ret = stream_read_value(&jsoninput, &value); type = TYPE_STREAM; }