From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1vy0-0004R4-Rn for qemu-devel@nongnu.org; Thu, 26 Nov 2015 07:48:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1vxx-0003WL-Ij for qemu-devel@nongnu.org; Thu, 26 Nov 2015 07:48:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59013) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1vxx-0003W3-DJ for qemu-devel@nongnu.org; Thu, 26 Nov 2015 07:48:01 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 01EA31071 for ; Thu, 26 Nov 2015 12:48:01 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-37.ams2.redhat.com [10.36.116.37]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tAQClxnS026188 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 26 Nov 2015 07:48:00 -0500 From: Markus Armbruster Date: Thu, 26 Nov 2015 13:47:45 +0100 Message-Id: <1448542078-11690-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL for-2.5 00/13] QMP and QObject patches List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The following changes since commit 1a4dab849d5d06191ab5e5850f6b8bfcad8ceb47: Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2015-11-25 14:47:06 +0000) are available in the git repository at: git://repo.or.cz/qemu/armbru.git tags/pull-monitor-2015-11-26 for you to fetch changes up to df649835fe48f635a93316fdefe96ced7189316e: qjson: Limit number of tokens in addition to total size (2015-11-26 10:07:07 +0100) ---------------------------------------------------------------- QMP and QObject patches ---------------------------------------------------------------- Markus Armbruster (10): monitor: Plug memory leak on QMP error 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 | 3 +- 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, 224 insertions(+), 313 deletions(-) -- 2.4.3