[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 06/14] qstring: Make conversion from QObject * acc
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v3 06/14] qstring: Make conversion from QObject * accept null |
Date: |
Thu, 29 Oct 2015 15:32:06 +0100 |
qobject_to_qstring() 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/qdict.c | 11 +++--------
qobject/qstring.c | 4 ++--
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
index 267783c..eb6e110 100644
--- a/qapi/qmp-input-visitor.c
+++ b/qapi/qmp-input-visitor.c
@@ -255,15 +255,15 @@ static void qmp_input_type_str(Visitor *v, char **obj,
const char *name,
Error **errp)
{
QmpInputVisitor *qiv = to_qiv(v);
- QObject *qobj = qmp_input_get_object(qiv, name, true);
+ QString *qstr = qobject_to_qstring(qmp_input_get_object(qiv, name, true));
- if (!qobj || qobject_type(qobj) != QTYPE_QSTRING) {
+ if (!qstr) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"string");
return;
}
- *obj = g_strdup(qstring_get_str(qobject_to_qstring(qobj)));
+ *obj = g_strdup(qstring_get_str(qstr));
}
static void qmp_input_type_number(Visitor *v, double *obj, const char *name,
diff --git a/qobject/qdict.c b/qobject/qdict.c
index 97e881b..2d67bf1 100644
--- a/qobject/qdict.c
+++ b/qobject/qdict.c
@@ -282,8 +282,7 @@ QDict *qdict_get_qdict(const QDict *qdict, const char *key)
*/
const char *qdict_get_str(const QDict *qdict, const char *key)
{
- QObject *obj = qdict_get_obj(qdict, key, QTYPE_QSTRING);
- return qstring_get_str(qobject_to_qstring(obj));
+ return qstring_get_str(qobject_to_qstring(qdict_get(qdict, key)));
}
/**
@@ -325,13 +324,9 @@ bool qdict_get_try_bool(const QDict *qdict, const char
*key, bool def_value)
*/
const char *qdict_get_try_str(const QDict *qdict, const char *key)
{
- QObject *obj;
+ QString *qstr = qobject_to_qstring(qdict_get(qdict, key));
- obj = qdict_get(qdict, key);
- if (!obj || qobject_type(obj) != QTYPE_QSTRING)
- return NULL;
-
- return qstring_get_str(qobject_to_qstring(obj));
+ return qstr ? qstring_get_str(qstr) : NULL;
}
/**
diff --git a/qobject/qstring.c b/qobject/qstring.c
index 607b7a1..cb72dfb 100644
--- a/qobject/qstring.c
+++ b/qobject/qstring.c
@@ -117,9 +117,9 @@ void qstring_append_chr(QString *qstring, int c)
*/
QString *qobject_to_qstring(const QObject *obj)
{
- if (qobject_type(obj) != QTYPE_QSTRING)
+ if (!obj || qobject_type(obj) != QTYPE_QSTRING) {
return NULL;
-
+ }
return container_of(obj, QString, base);
}
--
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 <=
- [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, 2015/10/29
- [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