qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL for-2.5 04/13] check-qjson: Add test for JSON nesting depth limit
Date: Thu, 26 Nov 2015 13:47:49 +0100	[thread overview]
Message-ID: <1448542078-11690-5-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1448542078-11690-1-git-send-email-armbru@redhat.com>

This would have prevented the regression mentioned in the previous
commit.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1448486613-17634-4-git-send-email-armbru@redhat.com>
---
 tests/check-qjson.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/check-qjson.c b/tests/check-qjson.c
index 1cfffa5..61e9bfb 100644
--- a/tests/check-qjson.c
+++ b/tests/check-qjson.c
@@ -1484,6 +1484,30 @@ static void unterminated_literal(void)
     g_assert(obj == NULL);
 }
 
+static char *make_nest(char *buf, size_t cnt)
+{
+    memset(buf, '[', cnt - 1);
+    buf[cnt - 1] = '{';
+    buf[cnt] = '}';
+    memset(buf + cnt + 1, ']', cnt - 1);
+    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 +1543,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

  parent reply	other threads:[~2015-11-26 12:48 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-26 12:47 [Qemu-devel] [PULL for-2.5 00/13] QMP and QObject patches Markus Armbruster
2015-11-26 12:47 ` [Qemu-devel] [PULL for-2.5 01/13] monitor: Plug memory leak on QMP error Markus Armbruster
2015-11-26 12:47 ` [Qemu-devel] [PULL for-2.5 02/13] qjson: Apply nesting limit more sanely Markus Armbruster
2015-11-26 12:47 ` [Qemu-devel] [PULL for-2.5 03/13] qjson: Don't crash when input exceeds nesting limit Markus Armbruster
2015-11-26 12:47 ` Markus Armbruster [this message]
2015-11-26 12:47 ` [Qemu-devel] [PULL for-2.5 05/13] qjson: Spell out some silent assumptions Markus Armbruster
2015-11-26 12:47 ` [Qemu-devel] [PULL for-2.5 06/13] qjson: Give each of the six structural chars its own token type Markus Armbruster
2015-11-26 12:47 ` [Qemu-devel] [PULL for-2.5 07/13] qjson: Inline token_is_keyword() and simplify Markus Armbruster
2015-11-26 12:47 ` [Qemu-devel] [PULL for-2.5 08/13] qjson: Inline token_is_escape() " Markus Armbruster
2015-11-26 12:47 ` [Qemu-devel] [PULL for-2.5 09/13] qjson: replace QString in JSONLexer with GString Markus Armbruster
2015-11-26 12:47 ` [Qemu-devel] [PULL for-2.5 10/13] qjson: Convert to parser to recursive descent Markus Armbruster
2015-11-26 12:47 ` [Qemu-devel] [PULL for-2.5 11/13] qjson: store tokens in a GQueue Markus Armbruster
2015-11-26 12:47 ` [Qemu-devel] [PULL for-2.5 12/13] qjson: surprise, allocating 6 QObjects per token is expensive Markus Armbruster
2015-11-26 12:47 ` [Qemu-devel] [PULL for-2.5 13/13] qjson: Limit number of tokens in addition to total size Markus Armbruster
2015-11-26 16:50 ` [Qemu-devel] [PULL for-2.5 00/13] QMP and QObject patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1448542078-11690-5-git-send-email-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).