yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-03 20:55:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Make QObject input visitor set *list reliably

Browse source 
qobject_input_start_struct() sets *list, except when it fails because
qobject_input_get_object() fails, i.e. the input object doesn't exist.

All the other input visitor start_struct(), start_list(),
start_alternate() always set *obj / *list.

Change qobject_input_start_struct() to match.

Backports commit 58561c27669ddf1c6d39ff8ce25837c6f2d9d92c from qemu
This commit is contained in:
Markus Armbruster 2018-03-02 11:31:56 -05:00 committed by Lioncash
parent fdf09c6d12
commit a5cf19858d
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
qemu/qapi/qobject-input-visitor.c
View file

@ -199,25 +199,21 @@ static void qobject_input_start_list(Visitor *v, const char *name,
QObject *qobj = qobject_input_get_object(qiv, name, true, errp); QObject *qobj = qobject_input_get_object(qiv, name, true, errp);
const QListEntry *entry; const QListEntry *entry;
if (list) {
*list = NULL;
}
if (!qobj) { if (!qobj) {
return; return;
} }
if (qobject_type(qobj) != QTYPE_QLIST) { if (qobject_type(qobj) != QTYPE_QLIST) {
if (list) {
*list = NULL;
}
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"list"); "list");
return; return;
} }
entry = qobject_input_push(qiv, qobj, list); entry = qobject_input_push(qiv, qobj, list);
if (list) { if (entry && list) {
if (entry) { *list = g_malloc0(size);
*list = g_malloc0(size);
} else {
*list = NULL;
}
} }
} }