From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57294) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrmZa-00049k-O0 for qemu-devel@nongnu.org; Thu, 29 Oct 2015 08:44:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZrmZV-0006MY-LG for qemu-devel@nongnu.org; Thu, 29 Oct 2015 08:44:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49608) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrmZV-0006Li-EH for qemu-devel@nongnu.org; Thu, 29 Oct 2015 08:44:49 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id C07E1C0DA362 for ; Thu, 29 Oct 2015 12:44:45 +0000 (UTC) From: Markus Armbruster Date: Thu, 29 Oct 2015 13:44:40 +0100 Message-Id: <1446122683-2355-2-git-send-email-armbru@redhat.com> In-Reply-To: <1446122683-2355-1-git-send-email-armbru@redhat.com> References: <1446122683-2355-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 1/4] json-streamer: Apply nesting limit more sanely List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com 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 --- 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