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/qint.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/qint.c')
| -rw-r--r-- | qobject/qint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qobject/qint.c b/qobject/qint.c index 86b9b04f0b..999688e9ce 100644 --- a/qobject/qint.c +++ b/qobject/qint.c @@ -50,9 +50,9 @@ int64_t qint_get_int(const QInt *qi) */ QInt *qobject_to_qint(const QObject *obj) { - if (qobject_type(obj) != QTYPE_QINT) + if (!obj || qobject_type(obj) != QTYPE_QINT) { return NULL; - + } return container_of(obj, QInt, base); } |