diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-07-03 10:53:55 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-07-03 23:18:56 +0200 |
| commit | ab45015a968cc2c784a00775d52c6ea17e72c9fb (patch) | |
| tree | 1d84d35cfba01d388a3b8d462dcfcc3b2a0cbea5 | |
| parent | cd499d2058adb657b034023e9e7428c94b0f212d (diff) | |
| download | focaccia-qemu-ab45015a968cc2c784a00775d52c6ea17e72c9fb.tar.gz focaccia-qemu-ab45015a968cc2c784a00775d52c6ea17e72c9fb.zip | |
qobject: Let qobject_from_jsonf() fail instead of abort
qobject_from_jsonf() aborts on error, unlike qobject_from_jsonv(), which returns null. Since all remaining users of qobject_from_jsonf() cope fine with null, change it to return null. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20180703085358.13941-30-armbru@redhat.com>
| -rw-r--r-- | qobject/qjson.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/qobject/qjson.c b/qobject/qjson.c index 0df3120202..2f6a590e44 100644 --- a/qobject/qjson.c +++ b/qobject/qjson.c @@ -59,10 +59,6 @@ QObject *qobject_from_json(const char *string, Error **errp) return qobject_from_jsonv(string, NULL, errp); } -/* - * IMPORTANT: This function aborts on error, thus it must not - * be used with untrusted arguments. - */ QObject *qobject_from_jsonf(const char *string, ...) { QObject *obj; @@ -72,7 +68,6 @@ QObject *qobject_from_jsonf(const char *string, ...) obj = qobject_from_jsonv(string, &ap, &error_abort); va_end(ap); - assert(obj != NULL); return obj; } |