aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-01-07 09:42:19 +0100
committerUlf Hermann <ulf.hermann@qt.io>2020-01-08 09:28:48 +0100
commit5c681f0f0f220c80f412d36a1b644c3eb5e080df (patch)
treeef50915f96bab132804b06db8be9ef4a339a65b7 /tests
parentcbf97ccf8bb46c720de01a79f39b335dc74db71b (diff)
V4: Don't crash when iterating invalid Proxy objects
Fixes: QTBUG-81109 Change-Id: I97f37c68d33f414d7bffa9b66e0aaed93370dc68 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qml/qjsengine/tst_qjsengine.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
index d348881e2e..df428d5929 100644
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@ -256,6 +256,7 @@ private slots:
void sortSparseArray();
void compileBrokenRegexp();
void sortNonStringArray();
+ void iterateInvalidProxy();
void tostringRecursionCheck();
void arrayIncludesWithLargeArray();
@@ -5079,6 +5080,20 @@ void tst_QJSEngine::sortNonStringArray()
QCOMPARE(value.toString(), "TypeError: Cannot convert a symbol to a string.");
}
+void tst_QJSEngine::iterateInvalidProxy()
+{
+ QJSEngine engine;
+ const auto value = engine.evaluate(
+ "const v1 = new Proxy(Reflect, Reflect);"
+ "for (const v2 in v1) {}"
+ "const v3 = { getOwnPropertyDescriptor: eval, getPrototypeOf: eval };"
+ "const v4 = new Proxy(v3, v3);"
+ "for (const v5 in v4) {}"
+ );
+ QVERIFY(value.isError());
+ QCOMPARE(value.toString(), "TypeError: Type error");
+}
+
QTEST_MAIN(tst_QJSEngine)
#include "tst_qjsengine.moc"