[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 for-2.5 00/12] qjson: Fix crash & save a lot of m
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 for-2.5 00/12] qjson: Fix crash & save a lot of memory |
Date: |
Wed, 25 Nov 2015 22:23:21 +0100 |
This is a fusion of my "[PATCH v2 0/4] json-streamer: Fix up code to
limit nesting and size" and Paolo's "[PATCH v2 for-2.5? 0/4] qjson:
save a lot of memory", with four straightforward cleanups thrown in to
simplify the later patches.
PATCH 01-03 are about the nesting limit.
PATCH 04-07 are cleanups.
PATCH 09-11 are Paolo's, except I pretty much rewrote PATCH 10 to
fully kill the backtracking.
PATCH 12 limits the number of tokens in addition to the total token
size.
Why 2.5? In my opinion:
* PATCH 01-03 are simple fixes plus a new test.
* PATCH 04-11 reduce memory usage dramatically. Makes check-qjson's
large_dict test (~100k tokens) run more than ten times faster.
If this is deemed too risky for 2.5, PATCH 12 needs to be replaced
by v2 (different commit message, *much* lower limit).
* PATCH 12 is simple enough.
Markus Armbruster (9):
qjson: Apply nesting limit more sanely
qjson: Don't crash when input exceeds nesting limit
check-qjson: Add test for JSON nesting depth limit
qjson: Spell out some silent assumptions
qjson: Give each of the six structural chars its own token type
qjson: Inline token_is_keyword() and simplify
qjson: Inline token_is_escape() and simplify
qjson: Convert to parser to recursive descent
qjson: Limit number of tokens in addition to total size
Paolo Bonzini (3):
qjson: replace QString in JSONLexer with GString
qjson: store tokens in a GQueue
qjson: surprise, allocating 6 QObjects per token is expensive
include/qapi/qmp/json-lexer.h | 16 +-
include/qapi/qmp/json-parser.h | 4 +-
include/qapi/qmp/json-streamer.h | 16 +-
monitor.c | 2 +-
qga/main.c | 2 +-
qobject/json-lexer.c | 48 +++---
qobject/json-parser.c | 330 ++++++++++++---------------------------
qobject/json-streamer.c | 89 ++++++-----
qobject/qjson.c | 2 +-
tests/check-qjson.c | 25 +++
tests/libqtest.c | 2 +-
11 files changed, 223 insertions(+), 313 deletions(-)
--
2.4.3
- [Qemu-devel] [PATCH v3 for-2.5 00/12] qjson: Fix crash & save a lot of memory,
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 for-2.5 01/12] qjson: Apply nesting limit more sanely, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 06/12] qjson: Inline token_is_keyword() and simplify, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 07/12] qjson: Inline token_is_escape() and simplify, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 03/12] check-qjson: Add test for JSON nesting depth limit, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 04/12] qjson: Spell out some silent assumptions, Markus Armbruster, 2015/11/25