Re: [Qemu-devel] [PATCH 35/56] json: Don't create JSON_ERROR tokens that won't be used

2018-08-13 Thread Eric Blake

On 08/08/2018 07:03 AM, Markus Armbruster wrote:

Signed-off-by: Markus Armbruster 
---
  qobject/json-streamer.c | 6 ++
  1 file changed, 2 insertions(+), 4 deletions(-)



Reviewed-by: Eric Blake 

--
Eric Blake, Principal Software Engineer
Red Hat, Inc.   +1-919-301-3266
Virtualization:  qemu.org | libvirt.org



[Qemu-devel] [PATCH 35/56] json: Don't create JSON_ERROR tokens that won't be used

2018-08-08 Thread Markus Armbruster
Signed-off-by: Markus Armbruster 
---
 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 &&
-- 
2.17.1