[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/6] qlist: Make conversion from QObject * accept nu
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 5/6] qlist: Make conversion from QObject * accept null |
Date: |
Thu, 15 Oct 2015 16:15:36 +0200 |
qobject_to_qlist() crashes on null, which is a trap for the unwary.
Return null instead.
Signed-off-by: Markus Armbruster <address@hidden>
---
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
- [Qemu-devel] [PATCH 0/6] qobject: Make conversion from QObject * accept null, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PATCH 1/6] qobject: Drop QObject_HEAD, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PATCH 2/6] qbool: Make conversion from QObject * accept null, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PATCH 5/6] qlist: Make conversion from QObject * accept null,
Markus Armbruster <=
- [Qemu-devel] [PATCH 6/6] qstring: Make conversion from QObject * accept null, Markus Armbruster, 2015/10/15
- Re: [Qemu-devel] [PATCH 0/6] qobject: Make conversion from QObject * accept null, Luiz Capitulino, 2015/10/15
- [Qemu-devel] [PATCH 3/6] qdict: Make conversion from QObject * accept null, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PATCH 4/6] qfloat qint: Make conversion from QObject * accept null, Markus Armbruster, 2015/10/15