diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-10-15 16:15:36 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-10-29 14:34:45 +0100 |
| commit | 2d6421a90047a83f6722832405fe09571040ea5b (patch) | |
| tree | 1a350b1e9a09f2166989ccc4786b58e57fa615a1 | |
| parent | fcf73f66a67f5e58c18216f8c8651e38cf4d90af (diff) | |
qlist: Make conversion from QObject * accept null
qobject_to_qlist() crashes on null, which is a trap for the unwary.
Return null instead.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1444918537-18107-6-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
| -rw-r--r-- | qobject/qlist.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/qobject/qlist.c b/qobject/qlist.c index 1ced0de58e..298003aaf7 100644 --- a/qobject/qlist.c +++ b/qobject/qlist.c @@ -142,10 +142,9 @@ size_t qlist_size(const QList *qlist) */ QList *qobject_to_qlist(const QObject *obj) { - if (qobject_type(obj) != QTYPE_QLIST) { + if (!obj || qobject_type(obj) != QTYPE_QLIST) { return NULL; } - return container_of(obj, QList, base); } |