On 26 November 2015 at 12:47, Markus Armbruster <arm...@redhat.com> wrote: > The following changes since commit 1a4dab849d5d06191ab5e5850f6b8bfcad8ceb47: > > Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging > (2015-11-25 14:47:06 +0000) > > are available in the git repository at: > > git://repo.or.cz/qemu/armbru.git tags/pull-monitor-2015-11-26 > > for you to fetch changes up to df649835fe48f635a93316fdefe96ced7189316e: > > qjson: Limit number of tokens in addition to total size (2015-11-26 > 10:07:07 +0100) > > ---------------------------------------------------------------- > QMP and QObject patches > > ---------------------------------------------------------------- > Markus Armbruster (10): > monitor: Plug memory leak on QMP error > 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
Applied, thanks. -- PMM
