From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40228) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1hXP-000515-CW for qemu-devel@nongnu.org; Wed, 25 Nov 2015 16:23:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1hXM-0000Ww-7f for qemu-devel@nongnu.org; Wed, 25 Nov 2015 16:23:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40483) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1hXM-0000WR-22 for qemu-devel@nongnu.org; Wed, 25 Nov 2015 16:23:36 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 8BD4349DC2 for ; Wed, 25 Nov 2015 21:23:35 +0000 (UTC) From: Markus Armbruster Date: Wed, 25 Nov 2015 22:23:21 +0100 Message-Id: <1448486613-17634-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v3 for-2.5 00/12] qjson: Fix crash & save a lot of memory List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, lcapitulino@redhat.com This is a fusion of my "[PATCH v2 0/4] json-streamer: Fix up code to limit nesting and size" and Paolo's "[PATCH v2 for-2.5? 0/4] qjson: save a lot of memory", with four straightforward cleanups thrown in to simplify the later patches. PATCH 01-03 are about the nesting limit. PATCH 04-07 are cleanups. PATCH 09-11 are Paolo's, except I pretty much rewrote PATCH 10 to fully kill the backtracking. PATCH 12 limits the number of tokens in addition to the total token size. Why 2.5? In my opinion: * PATCH 01-03 are simple fixes plus a new test. * PATCH 04-11 reduce memory usage dramatically. Makes check-qjson's large_dict test (~100k tokens) run more than ten times faster. If this is deemed too risky for 2.5, PATCH 12 needs to be replaced by v2 (different commit message, *much* lower limit). * PATCH 12 is simple enough. Markus Armbruster (9): qjson: Apply nesting limit more sanely qjson: Don't crash when input exceeds nesting limit check-qjson: Add test for JSON nesting depth limit qjson: Spell out some silent assumptions qjson: Give each of the six structural chars its own token type qjson: Inline token_is_keyword() and simplify qjson: Inline token_is_escape() and simplify qjson: Convert to parser to recursive descent qjson: Limit number of tokens in addition to total size Paolo Bonzini (3): qjson: replace QString in JSONLexer with GString qjson: store tokens in a GQueue qjson: surprise, allocating 6 QObjects per token is expensive include/qapi/qmp/json-lexer.h | 16 +- include/qapi/qmp/json-parser.h | 4 +- include/qapi/qmp/json-streamer.h | 16 +- monitor.c | 2 +- qga/main.c | 2 +- qobject/json-lexer.c | 48 +++--- qobject/json-parser.c | 330 ++++++++++++--------------------------- qobject/json-streamer.c | 89 ++++++----- qobject/qjson.c | 2 +- tests/check-qjson.c | 25 +++ tests/libqtest.c | 2 +- 11 files changed, 223 insertions(+), 313 deletions(-) -- 2.4.3