diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-08-23 18:40:02 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-08-24 20:26:37 +0200 |
| commit | ff281a272f67a07d8ea29ca0350c4a3e0d3de73c (patch) | |
| tree | 9bd823ea679b7188ca9d2185b33394e15c946faa /qobject/json-parser.c | |
| parent | 62815d85aed71eff7b6c3a524705180fb04f5d30 (diff) | |
| download | focaccia-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-parser.c')
| -rw-r--r-- | qobject/json-parser.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/qobject/json-parser.c b/qobject/json-parser.c index 95fa348e21..06aff19a5d 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -546,10 +546,6 @@ QObject *json_parser_parse(GQueue *tokens, va_list *ap, Error **errp) JSONParserContext ctxt = { .buf = tokens }; QObject *result; - if (!tokens) { - return NULL; - } - result = parse_value(&ctxt, ap); error_propagate(errp, ctxt.err); |