[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 02/14] qbool: Make conversion from QObject * accep
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v3 02/14] qbool: Make conversion from QObject * accept null |
Date: |
Thu, 29 Oct 2015 15:32:02 +0100 |
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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Luiz Capitulino <address@hidden>
---
qapi/qmp-input-visitor.c | 6 +++---
qobject/qbool.c | 4 ++--
qobject/qdict.c | 11 +++--------
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
index 5dd9ed5..f32ce81 100644
--- a/qapi/qmp-input-visitor.c
+++ b/qapi/qmp-input-visitor.c
@@ -240,15 +240,15 @@ static void qmp_input_type_bool(Visitor *v, bool *obj,
const char *name,
Error **errp)
{
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",
"boolean");
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,
diff --git a/qobject/qbool.c b/qobject/qbool.c
index 5ff69f0..bc6535f 100644
--- a/qobject/qbool.c
+++ b/qobject/qbool.c
@@ -51,9 +51,9 @@ bool qbool_get_bool(const QBool *qb)
*/
QBool *qobject_to_qbool(const QObject *obj)
{
- if (qobject_type(obj) != QTYPE_QBOOL)
+ if (!obj || qobject_type(obj) != QTYPE_QBOOL) {
return NULL;
-
+ }
return container_of(obj, QBool, base);
}
diff --git a/qobject/qdict.c b/qobject/qdict.c
index 67b1a58..f179f4e 100644
--- a/qobject/qdict.c
+++ b/qobject/qdict.c
@@ -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)
{
- QObject *obj = qdict_get_obj(qdict, key, QTYPE_QBOOL);
- return qbool_get_bool(qobject_to_qbool(obj));
+ return qbool_get_bool(qobject_to_qbool(qdict_get(qdict, key)));
}
/**
@@ -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)
{
- QObject *obj;
+ QBool *qbool = qobject_to_qbool(qdict_get(qdict, key));
- obj = qdict_get(qdict, key);
- if (!obj || qobject_type(obj) != QTYPE_QBOOL)
- return def_value;
-
- return qbool_get_bool(qobject_to_qbool(obj));
+ return qbool ? qbool_get_bool(qbool) : def_value;
}
/**
--
2.4.3
- [Qemu-devel] [PULL v3 00/14] QMP and QObject patches, Markus Armbruster, 2015/10/29
- [Qemu-devel] [PULL v3 06/14] qstring: Make conversion from QObject * accept null, Markus Armbruster, 2015/10/29
- [Qemu-devel] [PULL v3 07/14] monitor: Reduce casting of QAPI event QDict, Markus Armbruster, 2015/10/29
- [Qemu-devel] [PULL v3 03/14] qdict: Make conversion from QObject * accept null, Markus Armbruster, 2015/10/29
- [Qemu-devel] [PULL v3 01/14] qobject: Drop QObject_HEAD, Markus Armbruster, 2015/10/29
- [Qemu-devel] [PULL v3 11/14] glib: add compatibility interface for g_hash_table_add(), Markus Armbruster, 2015/10/29
- [Qemu-devel] [PULL v3 02/14] qbool: Make conversion from QObject * accept null,
Markus Armbruster <=
- [Qemu-devel] [PULL v3 04/14] qfloat qint: Make conversion from QObject * accept null, Markus Armbruster, 2015/10/29
- [Qemu-devel] [PULL v3 12/14] monitor: Turn monitor_qapi_event_state[] into a hash table, Markus Armbruster, 2015/10/29
- [Qemu-devel] [PULL v3 08/14] monitor: Simplify event throttling, Markus Armbruster, 2015/10/29
- [Qemu-devel] [PULL v3 09/14] monitor: Switch from timer_new() to timer_new_ns(), Markus Armbruster, 2015/10/29
- [Qemu-devel] [PULL v3 13/14] monitor: Throttle event VSERPORT_CHANGE separately by "id", Markus Armbruster, 2015/10/29
- [Qemu-devel] [PULL v3 05/14] qlist: Make conversion from QObject * accept null, Markus Armbruster, 2015/10/29
- [Qemu-devel] [PULL v3 14/14] docs: Document QMP event rate limiting, Markus Armbruster, 2015/10/29
- [Qemu-devel] [PULL v3 10/14] monitor: Split MonitorQAPIEventConf off MonitorQAPIEventState, Markus Armbruster, 2015/10/29
- Re: [Qemu-devel] [PULL v3 00/14] QMP and QObject patches, Peter Maydell, 2015/10/29