OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qfloat qint: Make conversion from QObject * accept null 

qobject_to_qfloat() and qobject_to_qint() crash 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-5-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:
Markus Armbruster 2015-10-15 16:15:35 +02:00
parent 89cad9f3ec
commit fcf73f66a6
4 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qapi/qmp-input-visitor.c
View File

@ -225,15 +225,15 @@ static void qmp_input_type_int(Visitor *v, int64_t *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); QInt *qint = qobject_to_qint(qmp_input_get_object(qiv, name, true));
if (!qobj || qobject_type(qobj) != QTYPE_QINT) { if (!qint) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"integer"); "integer");
return; return;
} }
*obj = qint_get_int(qobject_to_qint(qobj)); *obj = qint_get_int(qint);
} }
static void qmp_input_type_bool(Visitor *v, bool *obj, const char *name, static void qmp_input_type_bool(Visitor *v, bool *obj, const char *name,
@ -271,19 +271,23 @@ static void qmp_input_type_number(Visitor *v, double *obj, const char *name,
{ {
QmpInputVisitor *qiv = to_qiv(v); QmpInputVisitor *qiv = to_qiv(v);
QObject *qobj = qmp_input_get_object(qiv, name, true); QObject *qobj = qmp_input_get_object(qiv, name, true);
QInt *qint;
QFloat *qfloat;
if (!qobj || (qobject_type(qobj) != QTYPE_QFLOAT && qint = qobject_to_qint(qobj);
qobject_type(qobj) != QTYPE_QINT)) { if (qint) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", *obj = qint_get_int(qobject_to_qint(qobj));
"number");
return; return;
} }
if (qobject_type(qobj) == QTYPE_QINT) { qfloat = qobject_to_qfloat(qobj);
*obj = qint_get_int(qobject_to_qint(qobj)); if (qfloat) {
} else {
*obj = qfloat_get_double(qobject_to_qfloat(qobj)); *obj = qfloat_get_double(qobject_to_qfloat(qobj));
return;
} }
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"number");
} }
static void qmp_input_type_any(Visitor *v, QObject **obj, const char *name, static void qmp_input_type_any(Visitor *v, QObject **obj, const char *name,

11
qobject/qdict.c
View File

@ -229,8 +229,7 @@ double qdict_get_double(const QDict *qdict, const char *key)
*/ */
int64_t qdict_get_int(const QDict *qdict, const char *key) int64_t qdict_get_int(const QDict *qdict, const char *key)
{ {
QObject *obj = qdict_get_obj(qdict, key, QTYPE_QINT); return qint_get_int(qobject_to_qint(qdict_get(qdict, key)));
return qint_get_int(qobject_to_qint(obj));
} }
/** /**
@ -297,13 +296,9 @@ const char *qdict_get_str(const QDict *qdict, const char *key)
int64_t qdict_get_try_int(const QDict *qdict, const char *key, int64_t qdict_get_try_int(const QDict *qdict, const char *key,
int64_t def_value) int64_t def_value)
{ {
QObject *obj; QInt *qint = qobject_to_qint(qdict_get(qdict, key));
obj = qdict_get(qdict, key); return qint ? qint_get_int(qint) : def_value;
if (!obj || qobject_type(obj) != QTYPE_QINT)
return def_value;
return qint_get_int(qobject_to_qint(obj));
} }
/** /**

4
qobject/qfloat.c
View File

@ -51,9 +51,9 @@ double qfloat_get_double(const QFloat *qf)
*/ */
QFloat *qobject_to_qfloat(const QObject *obj) QFloat *qobject_to_qfloat(const QObject *obj)
{ {
if (qobject_type(obj) != QTYPE_QFLOAT) if (!obj || qobject_type(obj) != QTYPE_QFLOAT) {
return NULL; return NULL;
}
return container_of(obj, QFloat, base); return container_of(obj, QFloat, base);
} }

4
qobject/qint.c
View File

@ -50,9 +50,9 @@ int64_t qint_get_int(const QInt *qi)
*/ */
QInt *qobject_to_qint(const QObject *obj) QInt *qobject_to_qint(const QObject *obj)
{ {
if (qobject_type(obj) != QTYPE_QINT) if (!obj || qobject_type(obj) != QTYPE_QINT) {
return NULL; return NULL;
}
return container_of(obj, QInt, base); return container_of(obj, QInt, base);
} }