From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrmZa-00049i-NU 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-0006MU-LE for qemu-devel@nongnu.org; Thu, 29 Oct 2015 08:44:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35443) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrmZV-0006Lq-EN for qemu-devel@nongnu.org; Thu, 29 Oct 2015 08:44:49 -0400 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 30484A2C16 for ; Thu, 29 Oct 2015 12:44:46 +0000 (UTC) From: Markus Armbruster Date: Thu, 29 Oct 2015 13:44:42 +0100 Message-Id: <1446122683-2355-4-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 3/4] check-qjson: Add test for JSON nesting depth limit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com This would have prevented the regression mentioned in the previous commit. Signed-off-by: Markus Armbruster --- tests/check-qjson.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 1cfffa5..2579d79 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -1484,6 +1484,34 @@ static void unterminated_literal(void) g_assert(obj == NULL); } +static char *make_nest(char *buf, size_t cnt) +{ + int i; + + for (i = 0; i < cnt - 1; i++) { + buf[i] = '['; + buf[2 * cnt - i - 1] = ']'; + } + buf[cnt - 1] = '{'; + buf[cnt] = '}'; + buf[2 * cnt] = 0; + return buf; +} + +static void limits_nesting(void) +{ + enum { max_nesting = 1024 }; /* see qobject/json-streamer.c */ + char buf[2 * (max_nesting + 1) + 1]; + QObject *obj; + + obj = qobject_from_json(make_nest(buf, max_nesting)); + g_assert(obj != NULL); + qobject_decref(obj); + + obj = qobject_from_json(make_nest(buf, max_nesting + 1)); + g_assert(obj == NULL); +} + int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); @@ -1519,6 +1547,7 @@ int main(int argc, char **argv) g_test_add_func("/errors/invalid_array_comma", invalid_array_comma); g_test_add_func("/errors/invalid_dict_comma", invalid_dict_comma); g_test_add_func("/errors/unterminated/literal", unterminated_literal); + g_test_add_func("/errors/limits/nesting", limits_nesting); return g_test_run(); } -- 2.4.3