[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/13] qdict: Make conversion from QObject * accept n
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 03/13] qdict: Make conversion from QObject * accept null |
Date: |
Tue, 27 Oct 2015 10:21:37 +0100 |
qobject_to_qdict() 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>
---
qga/main.c | 11 +++--------
qobject/qdict.c | 6 +++---
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/qga/main.c b/qga/main.c
index 068169f..d2a0ffc 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -573,7 +573,6 @@ static void process_command(GAState *s, QDict *req)
static void process_event(JSONMessageParser *parser, QList *tokens)
{
GAState *s = container_of(parser, GAState, parser);
- QObject *obj;
QDict *qdict;
Error *err = NULL;
int ret;
@@ -581,9 +580,9 @@ static void process_event(JSONMessageParser *parser, QList
*tokens)
g_assert(s && parser);
g_debug("process_event: called");
- obj = json_parser_parse_err(tokens, NULL, &err);
- if (err || !obj || qobject_type(obj) != QTYPE_QDICT) {
- qobject_decref(obj);
+ qdict = qobject_to_qdict(json_parser_parse_err(tokens, NULL, &err));
+ if (err || !qdict) {
+ QDECREF(qdict);
qdict = qdict_new();
if (!err) {
g_warning("failed to parse event: unknown error");
@@ -593,12 +592,8 @@ static void process_event(JSONMessageParser *parser, QList
*tokens)
}
qdict_put_obj(qdict, "error", qmp_build_error_object(err));
error_free(err);
- } else {
- qdict = qobject_to_qdict(obj);
}
- g_assert(qdict);
-
/* handle host->guest commands */
if (qdict_haskey(qdict, "execute")) {
process_command(s, qdict);
diff --git a/qobject/qdict.c b/qobject/qdict.c
index f179f4e..6b32285 100644
--- a/qobject/qdict.c
+++ b/qobject/qdict.c
@@ -46,9 +46,9 @@ QDict *qdict_new(void)
*/
QDict *qobject_to_qdict(const QObject *obj)
{
- if (qobject_type(obj) != QTYPE_QDICT)
+ if (!obj || qobject_type(obj) != QTYPE_QDICT) {
return NULL;
-
+ }
return container_of(obj, QDict, base);
}
@@ -269,7 +269,7 @@ QList *qdict_get_qlist(const QDict *qdict, const char *key)
*/
QDict *qdict_get_qdict(const QDict *qdict, const char *key)
{
- return qobject_to_qdict(qdict_get_obj(qdict, key, QTYPE_QDICT));
+ return qobject_to_qdict(qdict_get(qdict, key));
}
/**
--
2.4.3
- [Qemu-devel] [PULL 00/13] QMP and QObject patches, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 09/13] monitor: Switch from timer_new() to timer_new_ns(), Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 03/13] qdict: Make conversion from QObject * accept null,
Markus Armbruster <=
- [Qemu-devel] [PULL 05/13] qlist: Make conversion from QObject * accept null, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 04/13] qfloat qint: Make conversion from QObject * accept null, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 01/13] qobject: Drop QObject_HEAD, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 02/13] qbool: Make conversion from QObject * accept null, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 13/13] docs: Document QMP event rate limiting, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 10/13] monitor: Split MonitorQAPIEventConf off MonitorQAPIEventState, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 06/13] qstring: Make conversion from QObject * accept null, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 07/13] monitor: Reduce casting of QAPI event QDict, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 08/13] monitor: Simplify event throttling, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 11/13] monitor: Turn monitor_qapi_event_state[] into a hash table, Markus Armbruster, 2015/10/27