summary refs log tree commit diff stats
path: root/qobject/json-lexer.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2018-08-23 18:40:02 +0200
committerMarkus Armbruster <armbru@redhat.com>2018-08-24 20:26:37 +0200
commitff281a272f67a07d8ea29ca0350c4a3e0d3de73c (patch)
tree9bd823ea679b7188ca9d2185b33394e15c946faa /qobject/json-lexer.c
parent62815d85aed71eff7b6c3a524705180fb04f5d30 (diff)
downloadfocaccia-qemu-ff281a272f67a07d8ea29ca0350c4a3e0d3de73c.tar.gz
focaccia-qemu-ff281a272f67a07d8ea29ca0350c4a3e0d3de73c.zip
json: Don't pass null @tokens to json_parser_parse()
json_parser_parse() normally returns the QObject on success.  Except
it returns null when its @tokens argument is null.

Its only caller json_message_process_token() passes null @tokens when
emitting a lexical error.  The call is a rather opaque way to say json
= NULL then.

Simplify matters by lifting the assignment to json out of the emit
path: initialize json to null, set it to the value of
json_parser_parse() when there's no lexical error.  Drop the special
case from json_parser_parse().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180823164025.12553-36-armbru@redhat.com>
Diffstat (limited to 'qobject/json-lexer.c')
0 files changed, 0 insertions, 0 deletions