mirror of
https://github.com/Motorhead1991/qemu.git
synced 2026-02-11 19:39:26 -07:00
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>
This commit is contained in:
parent
74c856e922
commit
b7f43fe460
1 changed files with 2 additions and 2 deletions
|
|
@ -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();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue