From 269e57ae28599b07368134a64452674009491593 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 23 Aug 2018 18:40:03 +0200 Subject: [PATCH] json: Don't create JSON_ERROR tokens that won't be used Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <20180823164025.12553-37-armbru@redhat.com> --- qobject/json-streamer.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/qobject/json-streamer.c b/qobject/json-streamer.c index 0c33186e8e..fa595a8761 100644 --- a/qobject/json-streamer.c +++ b/qobject/json-streamer.c @@ -56,6 +56,8 @@ void json_message_process_token(JSONLexer *lexer, GString *input, case JSON_RSQUARE: parser->bracket_count--; break; + case JSON_ERROR: + goto out_emit; default: break; } @@ -71,10 +73,6 @@ void json_message_process_token(JSONLexer *lexer, GString *input, g_queue_push_tail(parser->tokens, token); - if (type == JSON_ERROR) { - goto out_emit; - } - if (parser->brace_count < 0 || parser->bracket_count < 0 || (parser->brace_count == 0 &&