From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com
Subject: [Qemu-devel] [PATCH 5/6] qlist: Make conversion from QObject * accept null
Date: Thu, 15 Oct 2015 16:15:36 +0200 [thread overview]
Message-ID: <1444918537-18107-6-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1444918537-18107-1-git-send-email-armbru@redhat.com>
qobject_to_qlist() crashes on null, which is a trap for the unwary.
Return null instead.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
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
next prev parent reply other threads:[~2015-10-15 14:15 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-15 14:15 [Qemu-devel] [PATCH 0/6] qobject: Make conversion from QObject * accept null Markus Armbruster
2015-10-15 14:15 ` [Qemu-devel] [PATCH 1/6] qobject: Drop QObject_HEAD Markus Armbruster
2015-10-15 15:24 ` Eric Blake
2015-10-15 14:15 ` [Qemu-devel] [PATCH 2/6] qbool: Make conversion from QObject * accept null Markus Armbruster
2015-10-15 15:27 ` Eric Blake
2015-10-15 14:15 ` [Qemu-devel] [PATCH 3/6] qdict: " Markus Armbruster
2015-10-15 15:30 ` Eric Blake
2015-10-15 14:15 ` [Qemu-devel] [PATCH 4/6] qfloat qint: " Markus Armbruster
2015-10-15 16:09 ` Eric Blake
2015-10-15 14:15 ` Markus Armbruster [this message]
2015-10-15 16:10 ` [Qemu-devel] [PATCH 5/6] qlist: " Eric Blake
2015-10-15 14:15 ` [Qemu-devel] [PATCH 6/6] qstring: " Markus Armbruster
2015-10-15 16:11 ` Eric Blake
2015-10-15 16:06 ` [Qemu-devel] [PATCH 0/6] qobject: " Luiz Capitulino
2015-10-22 12:20 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444918537-18107-6-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).