]> git.proxmox.com Git - mirror_qemu.git/commitdiff
qlist: Make conversion from QObject * accept null
authorMarkus Armbruster <armbru@redhat.com>
Thu, 15 Oct 2015 14:15:36 +0000 (16:15 +0200)
committerMarkus Armbruster <armbru@redhat.com>
Thu, 29 Oct 2015 13:34:45 +0000 (14:34 +0100)
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>
qobject/qlist.c

index 1ced0de58e21467327aeb94223e4ee67bd114d1e..298003aaf761280e3e523f22cd59606d34f786ff 100644 (file)
@@ -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);
 }