[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1.3 1/2] qom: dynamic_cast of NULL is always NULL
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 1.3 1/2] qom: dynamic_cast of NULL is always NULL |
Date: |
Fri, 23 Nov 2012 16:56:17 +0100 |
Trying to cast a NULL value will cause a crash. Returning
NULL is also sensible, and it is also what the type-unsafe
DO_UPCAST macro does.
Reported-by: Markus Armbruster <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
qom/object.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/qom/object.c b/qom/object.c
index d7092b0..2e18c9a 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -417,7 +417,7 @@ void object_delete(Object *obj)
Object *object_dynamic_cast(Object *obj, const char *typename)
{
- if (object_class_dynamic_cast(object_get_class(obj), typename)) {
+ if (obj && object_class_dynamic_cast(object_get_class(obj), typename)) {
return obj;
}
@@ -430,7 +430,7 @@ Object *object_dynamic_cast_assert(Object *obj, const char
*typename)
inst = object_dynamic_cast(obj, typename);
- if (!inst) {
+ if (!inst && obj) {
fprintf(stderr, "Object %p is not an instance of type %s\n",
obj, typename);
abort();
--
1.8.0
[Qemu-devel] [PATCH 1.3 2/2] hmp: do not crash on invalid SCSI hotplug, Paolo Bonzini, 2012/11/23
Re: [Qemu-devel] [PATCH 1.3 0/2] "drive_add NN if=scsi" fixes, Anthony Liguori, 2012/11/26