diff options
| author | George Kiagiadakis <george.kiagiadakis@collabora.co.uk> | 2010-12-26 14:06:46 +0200 |
|---|---|---|
| committer | George Kiagiadakis <george.kiagiadakis@collabora.co.uk> | 2010-12-26 14:06:46 +0200 |
| commit | a7b8fb4746fd6c90d97c4c65d7deca24c32f1cb0 (patch) | |
| tree | af8c3b8f684488ca3ab1c6aace58c8bc07294f0f | |
| parent | 38e739b71858671fa8b216423fb0e2d324751011 (diff) | |
Avoid crashing in Type::fromInstance if instance is NULL.
| -rw-r--r-- | src/QGlib/type.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/QGlib/type.cpp b/src/QGlib/type.cpp index 885fd9f..abd25d1 100644 --- a/src/QGlib/type.cpp +++ b/src/QGlib/type.cpp @@ -24,7 +24,11 @@ namespace QGlib { Type Type::fromInstance(void *instance) { - return G_TYPE_FROM_INSTANCE(instance); + if (!instance) { + return Invalid; + } else { + return G_TYPE_FROM_INSTANCE(instance); + } } Type Type::fromName(const char *name) |