summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2012-05-01 15:02:48 +1000
committerQt by Nokia <qt-info@nokia.com>2012-05-01 09:41:27 +0200
commit40a73d7c63950caef47571ce9c53624e86324db3 (patch)
tree651af90fcd4635c3334d734b9a4084d5a4d780c7 /tests
parente1d53553259e7edefb2a76712fd6a1ddc072d22d (diff)
Fixed uninitialized memory in QMetaObjectBuilder::fromRelocatableData
static_metacall was never set on the metaobject written by QMetaObjectBuilder::fromRelocatableData, sometimes causing a crash. It should be initialized to 0. Change-Id: I79373d895e131f0cc2ff1af6d2177a0c1a282be7 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
index 8ae79e03a7..cfb23989dc 100644
--- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
+++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
@@ -1097,6 +1097,11 @@ void tst_QMetaObjectBuilder::relocatableData()
QMetaObject *meta = builder.toMetaObject();
QVERIFY(sameMetaObject(meta, &meta2));
+
+ QVERIFY(!meta2.d.extradata);
+ QVERIFY(!meta2.d.relatedMetaObjects);
+ QVERIFY(!meta2.d.static_metacall);
+
free(meta);
}