Commit 3f0fb073 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-04-07' into staging 



QAPI patches for 2020-04-07

# gpg: Signature made Tue 07 Apr 2020 12:43:38 BST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2020-04-07:
  json: Fix check for unbalanced right curly brace

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8f0d25c4 1394dc06

qobject/json-streamer.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ void json_message_process_token(JSONLexer *lexer, GString *input, 
    g_queue_push_tail(&parser->tokens, token);



    if ((parser->brace_count > 0 || parser->bracket_count > 0)

        && parser->bracket_count >= 0 && parser->bracket_count >= 0) {

        && parser->brace_count >= 0 && parser->bracket_count >= 0) {

        return;

    }