diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-04-16 09:36:38 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-28 12:49:53 +0200 |
| commit | 52fcb218c379bb2008e24a2b5b00b613219ba7f6 (patch) | |
| tree | ff19d8e3c509a96fc0ced9c60607c2430970a538 /tests/auto/qml/qjsengine/tst_qjsengine.cpp | |
| parent | 50d7c049e3310d4d9194c2efb5150e4e5a50e5ca (diff) | |
Fix marking of prototype objects in internal class pool
As per reported bug, we have to protect ourselves against potential loops
and can mark the internal classes much simpler by just walking through
the memory pool they were allocated in.
Task-number: QTBUG-38299
Change-Id: I3ae96e8082e76d06f4321c5aa6d2e9645d2830a0
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto/qml/qjsengine/tst_qjsengine.cpp')
| -rw-r--r-- | tests/auto/qml/qjsengine/tst_qjsengine.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp index 64c6754aa7..b2723b02fd 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -153,6 +153,7 @@ private slots: void indexedAccesses(); void prototypeChainGc(); + void prototypeChainGc_QTBUG38299(); void dynamicProperties(); @@ -2963,6 +2964,21 @@ void tst_QJSEngine::prototypeChainGc() QVERIFY(proto.isObject()); } +void tst_QJSEngine::prototypeChainGc_QTBUG38299() +{ + QJSEngine engine; + engine.evaluate("var mapping = {" + "'prop1': \"val1\",\n" + "'prop2': \"val2\"\n" + "}\n" + "\n" + "delete mapping.prop2\n" + "delete mapping.prop1\n" + "\n"); + // Don't hang! + engine.collectGarbage(); +} + void tst_QJSEngine::dynamicProperties() { { |