mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QAPI patches for 2020-04-07

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAl6MZ2oSHGFybWJydUBy
 ZWRoYXQuY29tAAoJEDhwtADrkYZTBTMP/28dQKp+4vbdW98TWg4MoxCkLviWmMLF
 qt8a6zK1WSoKgciUfCLWvGGW6lOmagOiLq+WGt+k23P9Wu5s0ax0tvm7p7Q8m7sx
 NMHh6MIPxCLcNh1zPQ8B2+tJSOOQtXfaZo6W4gfaJ+lgz/NtHPzjcs+tLvDhOofb
 QGH2dUBRmA2gh0kIO0fNfYWEL0/ckQA67bHnHWU714k+U8LWux7yJMK8z3gVjEIs
 Tk6eURF/vaNZrQmOOuqrMc8AIO6l3tgJG7Zcv+4Sv8tJUEiaiASiokEEmEs1bj63
 izt8pAF0EvfMoL/ZFODChTfJDsPuDQad5WApfqzLTE3zBWUEetIQjPZJwxMrv8uQ
 zLjEQxTMGTGkONrFASkSZqlRw6+mWOsE71KJwo/FEfHH2G2lzVnZRzdHhhSMB8+4
 F6dzHRd66oFWz/t2hwGIXc2ng1xqtc/llBC4HZBxBOUQ0iba6LP0clpBHUJ75UDB
 JClxFI6P6xztqSGejp2FsEy2FMUw67TnvRLGPS/t/NfcdsfNfEO1rL1M10RlThoa
 Nl131Opx50cT4jhMtOQS5wySQ8whtYHQQkMCfHc+QYXwmaAiRSvJrl227ywJcX3g
 AnSpCu8VeeKJKwhzLSA3UhROjbuk4NsR/NGERDe1iwtYV9X33/zdO/sGpdmX25rc
 G88DH3NWrzPR
 =BaVo
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2020-04-07 16:05:07 +01:00
commit 3f0fb07379
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qobject/json-streamer.c
View File

@ -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;
}