From 89cad9f3ec6b30d7550fb5704475fc9c3393a066 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 15 Oct 2015 16:15:34 +0200 Subject: qdict: Make conversion from QObject * accept null 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 Message-Id: <1444918537-18107-4-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake Reviewed-by: Luiz Capitulino --- qobject/qdict.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qobject') diff --git a/qobject/qdict.c b/qobject/qdict.c index f179f4e8ca..6b322850dc 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)); } /** -- cgit v1.2.1