diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-05-10 14:16:36 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-13 09:52:06 -0500 |
| commit | bf0fda346694db1eddecff1d74ff9f4d5eba3461 (patch) | |
| tree | 44bfba0bfc46f15b052b6f054ffb0847d1e0fe36 | |
| parent | 33bc94eb209864b4aef7f341f0c2b7cd8740396f (diff) | |
qom: allow casting of a NULL class
This mimics what we do in object_dynamic_cast_assert.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1368188203-3407-3-git-send-email-pbonzini@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | qom/object.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/qom/object.c b/qom/object.c index 75e6aac15f..35f4694987 100644 --- a/qom/object.c +++ b/qom/object.c @@ -449,10 +449,16 @@ Object *object_dynamic_cast_assert(Object *obj, const char *typename) ObjectClass *object_class_dynamic_cast(ObjectClass *class, const char *typename) { - TypeImpl *target_type = type_get_by_name(typename); - TypeImpl *type = class->type; ObjectClass *ret = NULL; + TypeImpl *target_type; + TypeImpl *type; + if (!class) { + return NULL; + } + + type = class->type; + target_type = type_get_by_name(typename); if (!target_type) { /* target class type unknown, so fail the cast */ return NULL; @@ -488,7 +494,7 @@ ObjectClass *object_class_dynamic_cast_assert(ObjectClass *class, { ObjectClass *ret = object_class_dynamic_cast(class, typename); - if (!ret) { + if (!ret && class) { fprintf(stderr, "Object %p is not an instance of type %s\n", class, typename); abort(); |