qbool: Make conversion from QObject * accept null
qobject_to_qbool() crashes on null, which is a trap for the unwary. Return null instead, and simplify a few callers. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1444918537-18107-3-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
parent
c7c462123c
commit
14b6160099
|
@ -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,
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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, bool def_value)
|
bool qdict_get_try_bool(const QDict *qdict, const char *key, bool 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));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue