[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/13] qlist: Make conversion from QObject * accept n
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 05/13] qlist: Make conversion from QObject * accept null |
Date: |
Tue, 27 Oct 2015 10:21:39 +0100 |
qobject_to_qlist() crashes on null, which is a trap for the unwary.
Return null instead.
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Luiz Capitulino <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] [PULL 00/13] QMP and QObject patches, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 09/13] monitor: Switch from timer_new() to timer_new_ns(), Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 03/13] qdict: Make conversion from QObject * accept null, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 05/13] qlist: Make conversion from QObject * accept null,
Markus Armbruster <=
- [Qemu-devel] [PULL 04/13] qfloat qint: Make conversion from QObject * accept null, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 01/13] qobject: Drop QObject_HEAD, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 02/13] qbool: Make conversion from QObject * accept null, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 13/13] docs: Document QMP event rate limiting, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 10/13] monitor: Split MonitorQAPIEventConf off MonitorQAPIEventState, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 06/13] qstring: Make conversion from QObject * accept null, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 07/13] monitor: Reduce casting of QAPI event QDict, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 08/13] monitor: Simplify event throttling, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 11/13] monitor: Turn monitor_qapi_event_state[] into a hash table, Markus Armbruster, 2015/10/27
- [Qemu-devel] [PULL 12/13] monitor: Throttle event VSERPORT_CHANGE separately by "id", Markus Armbruster, 2015/10/27