diff options
author | Markus Armbruster <armbru@redhat.com> | 2018-08-06 08:53:27 +0200 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2018-08-16 08:42:06 +0200 |
commit | 6ce80fd80355d29b3ed8c2fa14251a9b8276a86a (patch) | |
tree | 6d048a675aaa10b377a5470a4ae94b06084ca679 /qobject/qjson.c | |
parent | bb340eb2387edfc59098bde4caea387c369005b1 (diff) | |
download | qemu-6ce80fd80355d29b3ed8c2fa14251a9b8276a86a.zip qemu-6ce80fd80355d29b3ed8c2fa14251a9b8276a86a.tar.gz qemu-6ce80fd80355d29b3ed8c2fa14251a9b8276a86a.tar.bz2 |
qobject: Replace qobject_from_jsonf() by qobject_from_jsonf_nofail()
Commit ab45015a968 "qobject: Let qobject_from_jsonf() fail instead of
abort" fails to accomplish its stated aim: the function can still
abort due to its use of &error_abort.
Its rationale for letting it fail is that all remaining users cope
fine with failure. Well, they're just fine with aborting, too; it's
what they do on failure.
Simply reverting the broken commit would bring back the unfortunate
asymmetry between qobject_from_jsonf() and qobject_from_jsonv(): one
aborts, the other returns null. So also rename it to
qobject_from_jsonf_nofail().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180806065344.7103-7-armbru@redhat.com>
Diffstat (limited to 'qobject/qjson.c')
-rw-r--r-- | qobject/qjson.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/qobject/qjson.c b/qobject/qjson.c index 2f6a590..4a9dcff 100644 --- a/qobject/qjson.c +++ b/qobject/qjson.c @@ -59,7 +59,12 @@ QObject *qobject_from_json(const char *string, Error **errp) return qobject_from_jsonv(string, NULL, errp); } -QObject *qobject_from_jsonf(const char *string, ...) +/* + * Parse @string as JSON value with %-escapes interpolated. + * Abort on error. Do not use with untrusted @string. + * Return the resulting QObject. It is never null. + */ +QObject *qobject_from_jsonf_nofail(const char *string, ...) { QObject *obj; va_list ap; @@ -68,6 +73,7 @@ QObject *qobject_from_jsonf(const char *string, ...) obj = qobject_from_jsonv(string, &ap, &error_abort); va_end(ap); + assert(obj); return obj; } |