From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZroFg-0004mr-7s for qemu-devel@nongnu.org; Thu, 29 Oct 2015 10:32:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZroFX-0001C8-Ec for qemu-devel@nongnu.org; Thu, 29 Oct 2015 10:32:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55013) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZroFX-0001C1-A1 for qemu-devel@nongnu.org; Thu, 29 Oct 2015 10:32:19 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 0A408C0A5255 for ; Thu, 29 Oct 2015 14:32:19 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-44.ams2.redhat.com [10.36.116.44]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t9TEWHJd030257 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 29 Oct 2015 10:32:18 -0400 From: Markus Armbruster Date: Thu, 29 Oct 2015 15:32:05 +0100 Message-Id: <1446129134-26379-6-git-send-email-armbru@redhat.com> In-Reply-To: <1446129134-26379-1-git-send-email-armbru@redhat.com> References: <1446129134-26379-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL v3 05/14] qlist: Make conversion from QObject * accept null List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org qobject_to_qlist() crashes on null, which is a trap for the unwary. Return null instead. Signed-off-by: Markus Armbruster Message-Id: <1444918537-18107-6-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake Reviewed-by: Luiz Capitulino --- 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