Mercurial > dovecot > core-2.2

changeset 19784:7fbc18735f8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib: json_parse_next_stream() wrongly returned -1 even when a stream was returned.
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Sat, 20 Feb 2016 23:32:59 +0200
parents ef55202a5148
children 6022b536bf25
files src/lib/json-parser.c src/lib/test-json-parser.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib/json-parser.c	Sat Feb 20 19:47:58 2016 +0200
+++ b/src/lib/json-parser.c	Sat Feb 20 23:32:59 2016 +0200
@@ -639,7 +639,7 @@
 				      json_strinput_destroyed, parser);
 
 	*input_r = parser->strinput;
-	return 1;
+	return 0;
 }
 
 int json_parse_next_stream(struct json_parser *parser,
--- a/src/lib/test-json-parser.c	Sat Feb 20 19:47:58 2016 +0200
+++ b/src/lib/test-json-parser.c	Sat Feb 20 23:32:59 2016 +0200
@@ -140,7 +140,7 @@
 			} 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;
 			}