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>
(cherry picked from commit b7f43fe460
)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
parent
4fb9656b9d
commit
5e19e498b4
|
@ -417,7 +417,7 @@ void object_delete(Object *obj)
|
||||||
|
|
||||||
Object *object_dynamic_cast(Object *obj, const char *typename)
|
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;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -430,7 +430,7 @@ Object *object_dynamic_cast_assert(Object *obj, const char *typename)
|
||||||
|
|
||||||
inst = object_dynamic_cast(obj, typename);
|
inst = object_dynamic_cast(obj, typename);
|
||||||
|
|
||||||
if (!inst) {
|
if (!inst && obj) {
|
||||||
fprintf(stderr, "Object %p is not an instance of type %s\n",
|
fprintf(stderr, "Object %p is not an instance of type %s\n",
|
||||||
obj, typename);
|
obj, typename);
|
||||||
abort();
|
abort();
|
||||||
|
|
Loading…
Reference in New Issue