diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-10-15 16:15:37 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-10-29 14:34:45 +0100 |
| commit | 7f0278435df1fa845b3bd9556942f89296d4246b (patch) | |
| tree | ad364ba05fbd93e34fff0e52ac3ae35c351ea4bb /qobject/qdict.c | |
| parent | 2d6421a90047a83f6722832405fe09571040ea5b (diff) | |
qstring: Make conversion from QObject * accept null
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 <armbru@redhat.com>
Message-Id: <1444918537-18107-7-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'qobject/qdict.c')
| -rw-r--r-- | qobject/qdict.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/qobject/qdict.c b/qobject/qdict.c index 97e881b3a4..2d67bf1579 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; - - obj = qdict_get(qdict, key); - if (!obj || qobject_type(obj) != QTYPE_QSTRING) - return NULL; + QString *qstr = qobject_to_qstring(qdict_get(qdict, key)); - return qstring_get_str(qobject_to_qstring(obj)); + return qstr ? qstring_get_str(qstr) : NULL; } /** |