[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1][ 05/14] json-streamer: allow recovery after bad
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH v1][ 05/14] json-streamer: allow recovery after bad input |
Date: |
Wed, 1 Jun 2011 12:14:51 -0500 |
From: Anthony Liguori <address@hidden>
Once we detect a malformed message, make sure to reset our state.
Signed-off-by: Michael Roth <address@hidden>
---
json-streamer.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/json-streamer.c b/json-streamer.c
index f7e7a68..549e9b7 100644
--- a/json-streamer.c
+++ b/json-streamer.c
@@ -51,8 +51,12 @@ static void json_message_process_token(JSONLexer *lexer,
QString *token, JSONTok
qlist_append(parser->tokens, dict);
- if (parser->brace_count == 0 &&
- parser->bracket_count == 0) {
+ if (parser->brace_count < 0 ||
+ parser->bracket_count < 0 ||
+ (parser->brace_count == 0 &&
+ parser->bracket_count == 0)) {
+ parser->brace_count = 0;
+ parser->bracket_count = 0;
parser->emit(parser, parser->tokens);
QDECREF(parser->tokens);
parser->tokens = qlist_new();
--
1.7.0.4
- [Qemu-devel] [QAPI+QGA 1/3] Error propagation and JSON parser fix-ups, Michael Roth, 2011/06/01
- [Qemu-devel] [PATCH v1][ 03/14] Introduce the new error framework, Michael Roth, 2011/06/01
- [Qemu-devel] [PATCH v1][ 09/14] json-parser: detect premature EOI, Michael Roth, 2011/06/01
- [Qemu-devel] [PATCH v1][ 05/14] json-streamer: allow recovery after bad input,
Michael Roth <=
- [Qemu-devel] [PATCH v1][ 12/14] json-lexer: make lexer error-recovery more deterministic, Michael Roth, 2011/06/01
- [Qemu-devel] [PATCH v1][ 02/14] QError: Introduce qerror_format(), Michael Roth, 2011/06/01
- [Qemu-devel] [PATCH v1][ 13/14] json-streamer: add handling for JSON_ERROR token/state, Michael Roth, 2011/06/01
- [Qemu-devel] [PATCH v1][ 10/14] json-lexer: reset the lexer state on an invalid token, Michael Roth, 2011/06/01
- [Qemu-devel] [PATCH v1][ 01/14] QError: Introduce qerror_format_desc(), Michael Roth, 2011/06/01
- [Qemu-devel] [PATCH v1][ 04/14] json-parser: propagate error from parser, Michael Roth, 2011/06/01
- [Qemu-devel] [PATCH v1][ 08/14] json-streamer: make sure to reset token_size after emitting a token list, Michael Roth, 2011/06/01
- [Qemu-devel] [PATCH v1][ 06/14] json-lexer: limit the maximum size of a given token, Michael Roth, 2011/06/01
- [Qemu-devel] [PATCH v1][ 07/14] json-streamer: limit the maximum recursion depth and maximum token count, Michael Roth, 2011/06/01