From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1vy0-0004Qz-Qh 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-0003Wb-Je for qemu-devel@nongnu.org; Thu, 26 Nov 2015 07:48:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44104) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1vxx-0003W4-DN for qemu-devel@nongnu.org; Thu, 26 Nov 2015 07:48:01 -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 E9452C0B7AAF for ; Thu, 26 Nov 2015 12:48:00 +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 tAQClxpW005287 (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:47 +0100 Message-Id: <1448542078-11690-3-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 02/13] qjson: Apply nesting limit more sanely List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org The nesting limit from commit 29c75dd "json-streamer: limit the maximum recursion depth and maximum token count" applies separately to braces and brackets. This makes no sense. Apply it to their sum, because that's actually a measure of recursion depth. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <1448486613-17634-2-git-send-email-armbru@redhat.com> --- qobject/json-streamer.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qobject/json-streamer.c b/qobject/json-streamer.c index 1b2f9b1..dced2c7 100644 --- a/qobject/json-streamer.c +++ b/qobject/json-streamer.c @@ -64,8 +64,7 @@ static void json_message_process_token(JSONLexer *lexer, QString *token, JSONTok parser->bracket_count == 0)) { goto out_emit; } else if (parser->token_size > MAX_TOKEN_SIZE || - parser->bracket_count > MAX_NESTING || - parser->brace_count > MAX_NESTING) { + parser->bracket_count + parser->brace_count > MAX_NESTING) { /* Security consideration, we limit total memory allocated per object * and the maximum recursion depth that a message can force. */ -- 2.4.3