yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-05-30 12:27:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

qbool: Make conversion from QObject * accept null

Browse source 
qobject_to_qbool() crashes on null, which is a trap for the unwary.
Return null instead, and simplify a few callers.

Backports commit 14b6160099f0caf5dc9d62e637b007bc5d719a96 from qemu
This commit is contained in:
Markus Armbruster 2018-02-17 14:15:06 -05:00 committed by Lioncash
parent bdbaeb4b9b
commit 41ca5bddb8
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
3 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
qemu/qapi/qmp-input-visitor.c
View file

@ -240,15 +240,15 @@ static void qmp_input_type_bool(Visitor *v, bool *obj, const char *name,
Error **errp) Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QmpInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true); QBool *qbool = qobject_to_qbool(qmp_input_get_object(qiv, name, true));
if (!qobj || qobject_type(qobj) != QTYPE_QBOOL) { if (!qbool) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"boolean"); "boolean");
return; return;
} }
*obj = qbool_get_bool(qobject_to_qbool(qobj)); *obj = qbool_get_bool(qbool);
} }
static void qmp_input_type_str(Visitor *v, char **obj, const char *name, static void qmp_input_type_str(Visitor *v, char **obj, const char *name,

4
qemu/qobject/qbool.c
View file

@ -51,9 +51,9 @@ bool qbool_get_bool(const QBool *qb)
*/ */
QBool *qobject_to_qbool(const QObject *obj) QBool *qobject_to_qbool(const QObject *obj)
{ {
if (qobject_type(obj) != QTYPE_QBOOL) if (!obj || qobject_type(obj) != QTYPE_QBOOL) {
return NULL; return NULL;
}
return container_of(obj, QBool, base); return container_of(obj, QBool, base);
} }

11
qemu/qobject/qdict.c
View file

@ -243,8 +243,7 @@ int64_t qdict_get_int(const QDict *qdict, const char *key)
*/ */
bool qdict_get_bool(const QDict *qdict, const char *key) bool qdict_get_bool(const QDict *qdict, const char *key)
{ {
QObject *obj = qdict_get_obj(qdict, key, QTYPE_QBOOL); return qbool_get_bool(qobject_to_qbool(qdict_get(qdict, key)));
return qbool_get_bool(qobject_to_qbool(obj));
} }
/** /**
@ -316,13 +315,9 @@ int64_t qdict_get_try_int(const QDict *qdict, const char *key,
*/ */
bool qdict_get_try_bool(const QDict *qdict, const char *key, int def_value) bool qdict_get_try_bool(const QDict *qdict, const char *key, int def_value)
{ {
QObject *obj; QBool *qbool = qobject_to_qbool(qdict_get(qdict, key));
obj = qdict_get(qdict, key); return qbool ? qbool_get_bool(qbool) : def_value;
if (!obj || qobject_type(obj) != QTYPE_QBOOL)
return def_value;
return qbool_get_bool(qobject_to_qbool(obj));
} }
/** /**