[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 49/58] json: Streamline json_message_process_token()
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 49/58] json: Streamline json_message_process_token() |
Date: |
Fri, 24 Aug 2018 21:31:57 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
---
qobject/json-streamer.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/qobject/json-streamer.c b/qobject/json-streamer.c
index 810aae521f..954bf9d468 100644
--- a/qobject/json-streamer.c
+++ b/qobject/json-streamer.c
@@ -99,16 +99,13 @@ void json_message_process_token(JSONLexer *lexer, GString
*input,
g_queue_push_tail(parser->tokens, token);
- if (parser->brace_count < 0 ||
- parser->bracket_count < 0 ||
- (parser->brace_count == 0 &&
- parser->bracket_count == 0)) {
- json = json_parser_parse(parser->tokens, parser->ap, &err);
- parser->tokens = NULL;
- goto out_emit;
+ if ((parser->brace_count > 0 || parser->bracket_count > 0)
+ && parser->bracket_count >= 0 && parser->bracket_count >= 0) {
+ return;
}
- return;
+ json = json_parser_parse(parser->tokens, parser->ap, &err);
+ parser->tokens = NULL;
out_emit:
parser->brace_count = 0;
--
2.17.1
- [Qemu-devel] [PULL 44/58] json: Fix latent parser aborts at end of input, (continued)
- [Qemu-devel] [PULL 44/58] json: Fix latent parser aborts at end of input, Markus Armbruster, 2018/08/24
- [Qemu-devel] [PULL 51/58] json: Make JSONToken opaque outside json-parser.c, Markus Armbruster, 2018/08/24
- [Qemu-devel] [PULL 41/58] json: Replace %I64d, %I64u by %PRId64, %PRIu64, Markus Armbruster, 2018/08/24
- [Qemu-devel] [PULL 38/58] json: Treat unwanted interpolation as lexical error, Markus Armbruster, 2018/08/24
- [Qemu-devel] [PULL 56/58] json: Improve safety of qobject_from_jsonf_nofail() & friends, Markus Armbruster, 2018/08/24
- [Qemu-devel] [PULL 53/58] json: Clean up headers, Markus Armbruster, 2018/08/24
- [Qemu-devel] [PULL 46/58] json: Assert json_parser_parse() consumes all tokens on success, Markus Armbruster, 2018/08/24
- [Qemu-devel] [PULL 47/58] qjson: Have qobject_from_json() & friends reject empty and blank, Markus Armbruster, 2018/08/24
- [Qemu-devel] [PULL 50/58] json: Unbox tokens queue in JSONMessageParser, Markus Armbruster, 2018/08/24
- [Qemu-devel] [PULL 48/58] json: Enforce token count and size limits more tightly, Markus Armbruster, 2018/08/24
- [Qemu-devel] [PULL 49/58] json: Streamline json_message_process_token(),
Markus Armbruster <=
- [Qemu-devel] [PULL 54/58] tests/drive_del-test: Fix harmless JSON interpolation bug, Markus Armbruster, 2018/08/24
- [Qemu-devel] [PULL 43/58] qjson: Fix qobject_from_json() & friends for multiple values, Markus Armbruster, 2018/08/24
- [Qemu-devel] [PULL 52/58] qobject: Drop superfluous includes of qemu-common.h, Markus Armbruster, 2018/08/24
- Re: [Qemu-devel] [PULL 00/58] QObject patches for 2018-08-24, Peter Maydell, 2018/08/25