From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL v2 05/14] qlist: Make conversion from QObject * accept null
Date: Wed, 28 Oct 2015 09:15:52 +0100 [thread overview]
Message-ID: <1446020161-21758-6-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1446020161-21758-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>
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 | 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-28 8:16 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-28 8:15 [Qemu-devel] [PULL v2 00/14] QMP and QObject patches Markus Armbruster
2015-10-28 8:15 ` [Qemu-devel] [PULL v2 01/14] qobject: Drop QObject_HEAD Markus Armbruster
2015-10-28 8:15 ` [Qemu-devel] [PULL v2 02/14] qbool: Make conversion from QObject * accept null Markus Armbruster
2015-10-28 8:15 ` [Qemu-devel] [PULL v2 03/14] qdict: " Markus Armbruster
2015-10-28 8:15 ` [Qemu-devel] [PULL v2 04/14] qfloat qint: " Markus Armbruster
2015-10-28 8:15 ` Markus Armbruster [this message]
2015-10-28 8:15 ` [Qemu-devel] [PULL v2 06/14] qstring: " Markus Armbruster
2015-10-28 8:15 ` [Qemu-devel] [PULL v2 07/14] monitor: Reduce casting of QAPI event QDict Markus Armbruster
2015-10-28 8:15 ` [Qemu-devel] [PULL v2 08/14] monitor: Simplify event throttling Markus Armbruster
2015-10-28 8:15 ` [Qemu-devel] [PULL v2 09/14] monitor: Switch from timer_new() to timer_new_ns() Markus Armbruster
2015-10-28 8:15 ` [Qemu-devel] [PULL v2 10/14] monitor: Split MonitorQAPIEventConf off MonitorQAPIEventState Markus Armbruster
2015-10-28 8:15 ` [Qemu-devel] [PULL v2 11/14] glib: add compatibility interface for g_hash_table_add() Markus Armbruster
2015-10-29 13:39 ` Markus Armbruster
2015-10-28 8:15 ` [Qemu-devel] [PULL v2 12/14] monitor: Turn monitor_qapi_event_state[] into a hash table Markus Armbruster
2015-10-28 8:16 ` [Qemu-devel] [PULL v2 13/14] monitor: Throttle event VSERPORT_CHANGE separately by "id" Markus Armbruster
2015-10-28 8:16 ` [Qemu-devel] [PULL v2 14/14] docs: Document QMP event rate limiting Markus Armbruster
2015-10-28 15:07 ` [Qemu-devel] [PULL v2 00/14] QMP and QObject patches Peter Maydell
2015-10-28 15:24 ` Eric Blake
2015-10-29 13:05 ` 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=1446020161-21758-6-git-send-email-armbru@redhat.com \
--to=armbru@redhat.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).