[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 35/60] json: Don't create JSON_ERROR tokens that
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 35/60] json: Don't create JSON_ERROR tokens that won't be used |
Date: |
Fri, 17 Aug 2018 17:05:34 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 21/60] json: Reject invalid UTF-8 sequences, (continued)
- [Qemu-devel] [PATCH v2 21/60] json: Reject invalid UTF-8 sequences, Markus Armbruster, 2018/08/17
- [Qemu-devel] [PATCH v2 24/60] json: Accept overlong \xC0\x80 as U+0000 ("modified UTF-8"), Markus Armbruster, 2018/08/17
- [Qemu-devel] [PATCH v2 13/60] check-qjson: Fix utf8_string() to test all invalid sequences, Markus Armbruster, 2018/08/17
- [Qemu-devel] [PATCH v2 18/60] json: Revamp lexer documentation, Markus Armbruster, 2018/08/17
- [Qemu-devel] [PATCH v2 27/60] json: Reject invalid \uXXXX, fix \u0000, Markus Armbruster, 2018/08/17
- [Qemu-devel] [PATCH v2 36/60] json: Rename token JSON_ESCAPE & friends to JSON_INTERPOL, Markus Armbruster, 2018/08/17
- [Qemu-devel] [PATCH v2 52/60] json: Eliminate lexer state IN_WHITESPACE, pseudo-token JSON_SKIP, Markus Armbruster, 2018/08/17
- [Qemu-devel] [PATCH v2 20/60] check-qjson: Document we expect invalid UTF-8 to be rejected, Markus Armbruster, 2018/08/17
- [Qemu-devel] [PATCH v2 35/60] json: Don't create JSON_ERROR tokens that won't be used,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 37/60] json: Treat unwanted interpolation as lexical error, Markus Armbruster, 2018/08/17
- [Qemu-devel] [PATCH v2 29/60] check-qjson: Fix and enable utf8_string()'s disabled part, Markus Armbruster, 2018/08/17
- [Qemu-devel] [PATCH v2 58/60] json: Keep interpolation state in JSONParserContext, Markus Armbruster, 2018/08/17
- [Qemu-devel] [PATCH v2 60/60] json: Support %% in JSON strings when interpolating, Markus Armbruster, 2018/08/17
- [Qemu-devel] [PATCH v2 26/60] json: Simplify parse_string(), Markus Armbruster, 2018/08/17
- [Qemu-devel] [PATCH v2 33/60] json: Redesign the callback to consume JSON values, Markus Armbruster, 2018/08/17
- [Qemu-devel] [PATCH v2 11/60] check-qjson: Cover UTF-8 in single quoted strings, Markus Armbruster, 2018/08/17
- [Qemu-devel] [PATCH v2 50/60] json: Unbox tokens queue in JSONMessageParser, Markus Armbruster, 2018/08/17