qjson: Apply nesting limit more sanely
commit4f2d31fbc0bfdf41feea7d1be49f4f7ffa005534
authorMarkus Armbruster <armbru@redhat.com>
Wed, 25 Nov 2015 21:23:22 +0000 (25 22:23 +0100)
committerMarkus Armbruster <armbru@redhat.com>
Thu, 26 Nov 2015 08:17:57 +0000 (26 09:17 +0100)
tree6af228fd95b19f09a45fe5972b1858cd53ba3353
parent3a81a10179b702e031d8f84438193d83a64b4122
qjson: Apply nesting limit more sanely

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 <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1448486613-17634-2-git-send-email-armbru@redhat.com>
qobject/json-streamer.c