SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qobject: Let qobject_from_jsonf() fail instead of abort

Browse Source 
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>
This commit is contained in:
Markus Armbruster 2018-07-03 10:53:55 +02:00
parent cd499d2058
commit ab45015a96
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qobject/qjson.c
View File

@ -59,10 +59,6 @@ QObject *qobject_from_json(const char *string, Error **errp)
return qobject_from_jsonv(string, NULL, 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 *qobject_from_jsonf(const char *string, ...)
{ {
QObject *obj; QObject *obj;
@ -72,7 +68,6 @@ QObject *qobject_from_jsonf(const char *string, ...)
obj = qobject_from_jsonv(string, &ap, &error_abort); obj = qobject_from_jsonv(string, &ap, &error_abort);
va_end(ap); va_end(ap);
assert(obj != NULL);
return obj; return obj;
} }