diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-10-15 16:15:35 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-10-29 14:34:45 +0100 |
| commit | fcf73f66a67f5e58c18216f8c8651e38cf4d90af (patch) | |
| tree | ea430e78cc556fb332a9f3ec1c520e4d602700f3 /qobject/qdict.c | |
| parent | 89cad9f3ec6b30d7550fb5704475fc9c3393a066 (diff) | |
qfloat qint: Make conversion from QObject * accept null
qobject_to_qfloat() and qobject_to_qint() crash 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-5-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 6b322850dc..97e881b3a4 100644 --- a/qobject/qdict.c +++ b/qobject/qdict.c @@ -229,8 +229,7 @@ double qdict_get_double(const QDict *qdict, const char *key) */ int64_t qdict_get_int(const QDict *qdict, const char *key) { - QObject *obj = qdict_get_obj(qdict, key, QTYPE_QINT); - return qint_get_int(qobject_to_qint(obj)); + return qint_get_int(qobject_to_qint(qdict_get(qdict, key))); } /** @@ -297,13 +296,9 @@ const char *qdict_get_str(const QDict *qdict, const char *key) int64_t qdict_get_try_int(const QDict *qdict, const char *key, int64_t def_value) { - QObject *obj; - - obj = qdict_get(qdict, key); - if (!obj || qobject_type(obj) != QTYPE_QINT) - return def_value; + QInt *qint = qobject_to_qint(qdict_get(qdict, key)); - return qint_get_int(qobject_to_qint(obj)); + return qint ? qint_get_int(qint) : def_value; } /** |