[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.5 2/9] qom: allow casting of a NULL class
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH for-1.5 2/9] qom: allow casting of a NULL class |
Date: |
Fri, 10 May 2013 14:16:36 +0200 |
This mimics what we do in object_dynamic_cast_assert.
Signed-off-by: Paolo Bonzini <address@hidden>
---
qom/object.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/qom/object.c b/qom/object.c
index 75e6aac..35f4694 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();
--
1.8.1.4
- [Qemu-devel] [PATCH for-1.5 0/9] Disable expensive QOM cast debugging for official releases, Paolo Bonzini, 2013/05/10
- [Qemu-devel] [PATCH for-1.5 1/9] qom: improve documentation of cast functions, Paolo Bonzini, 2013/05/10
- [Qemu-devel] [PATCH for-1.5 2/9] qom: allow casting of a NULL class,
Paolo Bonzini <=
- [Qemu-devel] [PATCH for-1.5 3/9] qom: add a fast path to object_class_dynamic_cast, Paolo Bonzini, 2013/05/10
- [Qemu-devel] [PATCH for-1.5 4/9] qom: pass file/line/function to asserting casts, Paolo Bonzini, 2013/05/10
- [Qemu-devel] [PATCH for-1.5 5/9] qom: trace asserting casts, Paolo Bonzini, 2013/05/10
- [Qemu-devel] [PATCH for-1.5 7/9] build: disable QOM cast debugging for official releases, Paolo Bonzini, 2013/05/10
- [Qemu-devel] [PATCH for-1.5 6/9] qom: allow turning cast debugging off, Paolo Bonzini, 2013/05/10
- [Qemu-devel] [PATCH for-1.5 8/9] qom: simplify object_class_dynamic_cast, part 1, Paolo Bonzini, 2013/05/10
- [Qemu-devel] [PATCH for-1.5 9/9] qom: simplify object_class_dynamic_cast, part 2, Paolo Bonzini, 2013/05/10
- Re: [Qemu-devel] [PATCH for-1.5 0/9] Disable expensive QOM cast debugging for official releases, Anthony Liguori, 2013/05/10