diff options
author | Jędrzej Nowacki <jedrzej.nowacki@nokia.com> | 2012-01-23 16:34:50 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-29 15:21:01 +0100 |
commit | b08b254a798d2f4935ec770662c84d86bdfea97c (patch) | |
tree | 1263bbe56d85de6f4d5471a7fb8c1728c5182aa4 | |
parent | f91c39fe3aab8fae361559216494b283893a54fa (diff) |
Fix null pointer call in QMetaType::destruct().
Logic has a flow causing null pointer call during destruction of an
instance of a custom type in bootstrap mode.
The patch doesn't include autotests, because we do not test bootstrap
mode.
Change-Id: Ie70c6f4226cb604f094513621d96a560e84502d7
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
-rw-r--r-- | src/corelib/kernel/qmetatype.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index e5fd8a5d24..a0a1295426 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -1546,8 +1546,10 @@ class TypeDestructor { if (!qMetaTypeWidgetsHelper) return; dtor = qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].destructor; - } else + } else { customTypeDestructor(type, where); + return; + } dtor(where); } }; |