From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1vy0-0004R2-Qu for qemu-devel@nongnu.org; Thu, 26 Nov 2015 07:48:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1vxz-0003XA-Dl for qemu-devel@nongnu.org; Thu, 26 Nov 2015 07:48:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40471) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1vxz-0003X2-8L for qemu-devel@nongnu.org; Thu, 26 Nov 2015 07:48:03 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id E916DC0D2236 for ; Thu, 26 Nov 2015 12:48:02 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-37.ams2.redhat.com [10.36.116.37]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tAQCm1jA005311 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 26 Nov 2015 07:48:02 -0500 From: Markus Armbruster Date: Thu, 26 Nov 2015 13:47:50 +0100 Message-Id: <1448542078-11690-6-git-send-email-armbru@redhat.com> In-Reply-To: <1448542078-11690-1-git-send-email-armbru@redhat.com> References: <1448542078-11690-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL for-2.5 05/13] qjson: Spell out some silent assumptions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Markus Armbruster Message-Id: <1448486613-17634-5-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake --- 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