[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 for-2.5 04/12] qjson: Spell out some silent assum
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 for-2.5 04/12] qjson: Spell out some silent assumptions |
Date: |
Wed, 25 Nov 2015 22:23:25 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
---
include/qapi/qmp/json-lexer.h | 3 ++-
qobject/json-lexer.c | 7 ++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/include/qapi/qmp/json-lexer.h b/include/qapi/qmp/json-lexer.h
index cdff046..61a143f 100644
--- a/include/qapi/qmp/json-lexer.h
+++ b/include/qapi/qmp/json-lexer.h
@@ -18,7 +18,8 @@
#include "qapi/qmp/qlist.h"
typedef enum json_token_type {
- JSON_OPERATOR = 100,
+ JSON_MIN = 100,
+ JSON_OPERATOR = JSON_MIN,
JSON_INTEGER,
JSON_FLOAT,
JSON_KEYWORD,
diff --git a/qobject/json-lexer.c b/qobject/json-lexer.c
index b19623e..5735c1e 100644
--- a/qobject/json-lexer.c
+++ b/qobject/json-lexer.c
@@ -30,7 +30,7 @@
*/
enum json_lexer_state {
- IN_ERROR = 0,
+ IN_ERROR = 0, /* must really be 0, see json_lexer[] */
IN_DQ_UCODE3,
IN_DQ_UCODE2,
IN_DQ_UCODE1,
@@ -62,6 +62,8 @@ enum json_lexer_state {
IN_START,
};
+QEMU_BUILD_BUG_ON((int)JSON_MIN <= (int)IN_START);
+
#define TERMINAL(state) [0 ... 0x7F] = (state)
/* Return whether TERMINAL is a terminal state and the transition to it
@@ -71,6 +73,8 @@ enum json_lexer_state {
(json_lexer[(old_state)][0] == (terminal))
static const uint8_t json_lexer[][256] = {
+ /* Relies on default initialization to IN_ERROR! */
+
/* double quote string */
[IN_DQ_UCODE3] = {
['0' ... '9'] = IN_DQ_STRING,
@@ -287,6 +291,7 @@ static int json_lexer_feed_char(JSONLexer *lexer, char ch,
bool flush)
}
do {
+ assert(lexer->state <= ARRAY_SIZE(json_lexer));
new_state = json_lexer[lexer->state][(uint8_t)ch];
char_consumed = !TERMINAL_NEEDED_LOOKAHEAD(lexer->state, new_state);
if (char_consumed) {
--
2.4.3
- [Qemu-devel] [PATCH v3 for-2.5 00/12] qjson: Fix crash & save a lot of memory, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 01/12] qjson: Apply nesting limit more sanely, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 06/12] qjson: Inline token_is_keyword() and simplify, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 07/12] qjson: Inline token_is_escape() and simplify, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 03/12] check-qjson: Add test for JSON nesting depth limit, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 04/12] qjson: Spell out some silent assumptions,
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 for-2.5 12/12] qjson: Limit number of tokens in addition to total size, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 08/12] qjson: replace QString in JSONLexer with GString, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 09/12] qjson: Convert to parser to recursive descent, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 02/12] qjson: Don't crash when input exceeds nesting limit, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 10/12] qjson: store tokens in a GQueue, Markus Armbruster, 2015/11/25