diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-04-07 16:05:07 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-04-07 16:05:07 +0100 |
| commit | 3f0fb073792180ccb1646d662e2d13260f2dd984 (patch) | |
| tree | c795eec880f46bb6ca2332b8d4acfad891a1f2c4 | |
| parent | 8f0d25c464a1989d606f7b988d07b1147dfcde33 (diff) | |
| parent | 1394dc0690e7a1514bd6594322d5a2105e881769 (diff) | |
| download | qemu-3f0fb073792180ccb1646d662e2d13260f2dd984.zip qemu-3f0fb073792180ccb1646d662e2d13260f2dd984.tar.gz qemu-3f0fb073792180ccb1646d662e2d13260f2dd984.tar.bz2 | |
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: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | qobject/json-streamer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qobject/json-streamer.c b/qobject/json-streamer.c index 47dd7ea..b93d97b 100644 --- a/qobject/json-streamer.c +++ b/qobject/json-streamer.c @@ -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; } |