aboutsummaryrefslogtreecommitdiff
path: root/qom
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-11-23 16:56:17 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2012-11-26 09:38:54 -0600
commitb7f43fe46029d8fd0594cd599fa2599dcce0f553 (patch)
tree3d33e6c0128d23853da4fe6ef3162664d3bad69b /qom
parent74c856e9228445bac1624f6aad83422bdbc59f98 (diff)
downloadqemu-b7f43fe46029d8fd0594cd599fa2599dcce0f553.zip
qemu-b7f43fe46029d8fd0594cd599fa2599dcce0f553.tar.gz
qemu-b7f43fe46029d8fd0594cd599fa2599dcce0f553.tar.bz2
qom: dynamic_cast of NULL is always NULL
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 <armbru@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qom')
-rw-r--r--qom/object.c4
1 files 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();