From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54424) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmjJs-0005ij-3O for qemu-devel@nongnu.org; Thu, 15 Oct 2015 10:15:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZmjJn-0008Sx-1H for qemu-devel@nongnu.org; Thu, 15 Oct 2015 10:15:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50258) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmjJm-0008Sm-Oy for qemu-devel@nongnu.org; Thu, 15 Oct 2015 10:15:42 -0400 From: Markus Armbruster Date: Thu, 15 Oct 2015 16:15:36 +0200 Message-Id: <1444918537-18107-6-git-send-email-armbru@redhat.com> In-Reply-To: <1444918537-18107-1-git-send-email-armbru@redhat.com> References: <1444918537-18107-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 5/6] qlist: Make conversion from QObject * accept null List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com qobject_to_qlist() crashes on null, which is a trap for the unwary. Return null instead. Signed-off-by: Markus Armbruster --- qobject/qlist.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qobject/qlist.c b/qobject/qlist.c index 1ced0de..298003a 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); } -- 2.4.3