Add unit test for concatenated property name access

Task-number: QTBUG-23126
Change-Id: I706d5f4ba49a554c3816146f15a87e001cde9a3f
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

diff --git a/tests/auto/qml/qqmlecmascript/data/concatenatedStringPropertyAccess.qml b/tests/auto/qml/qqmlecmascript/data/concatenatedStringPropertyAccess.qml
new file mode 100644 (file)
index 0000000..573ad43
--- /dev/null
+++ b/tests/auto/qml/qqmlecmascript/data/concatenatedStringPropertyAccess.qml
@@ -0,0 +1,127 @@
+import QtQuick 2.0
+
+// this used to trigger crash: see QTBUG-23126
+Item {
+    id: root
+    property bool success: false
+
+    // each of these property names have partial strings
+    // which are prehashed by v8 (random, cos, sin, ...)
+    property int randomProperty: 4
+    property real cosProperty: 1
+    property real cossin: 1
+    property real propertycos: 1
+    property real cos: 1
+
+    // these property names are entirely "new".
+    property string kqwpald: "hello"
+    property bool poiuyt: false
+
+    Component.onCompleted: {
+        success = true;
+
+        // 1: ensure that we can access the properties by name
+
+        if (root["random" + "Property"] != 4) {
+            success = false;
+            return;
+        }
+
+        if (root["cos" + "Property"] != 1) {
+            success = false;
+            return;
+        }
+
+        if (root["cos" + "sin"] != 1) {
+            success = false;
+            return;
+        }
+
+        if (root["property" + "cos"] != 1) {
+            success = false;
+            return;
+        }
+
+        if (root["" + "cos"] != 1) {
+            success = false;
+            return;
+        }
+
+        if (root["cos" + ""] != 1) {
+            success = false;
+            return;
+        }
+
+        if (root["kq" + "wpald"] != "hello") {
+            success = false;
+            return;
+        }
+
+        if (root["poiu" + "yt"] != false) {
+            success = false;
+            return;
+        }
+
+        // 2: ensure that similarly named properties don't cause crash
+
+        if (root["random" + "property"] == 4) {
+            success = false;
+            return;
+        }
+
+        if (root["cos" + "property"] == 1) {
+            success = false;
+            return;
+        }
+
+        if (root["cos" + "Sin"] == 1) {
+            success = false;
+            return;
+        }
+
+        if (root["property" + "Cos"] == 1) {
+            success = false;
+            return;
+        }
+
+        if (root["" + "Cos"] == 1) {
+            success = false;
+            return;
+        }
+
+        if (root["Cos" + ""] == 1) {
+            success = false;
+            return;
+        }
+
+        if (root["kq" + "Wpald"] == "hello") {
+            success = false;
+            return;
+        }
+
+        if (root["poiu" + "Yt"] == false) {
+            success = false;
+            return;
+        }
+
+        // 3: ensure that toString doesn't crash
+
+        root["random" + "Property"].toString();
+        root["cos" + "Property"].toString();
+        root["cos" + "Sin"] ? root["cos" + "Sin"].toString() : "";
+        root["property" + "Cos"] ? root["property" + "Cos"].toString() : "";
+        root["Cos" + ""] ? root["Cos" + ""].toString() : "";
+        root["" + "Cos"] ? root["" + "Cos"].toString() : "";
+        root["kq" + "Wpald"] ? root["kq" + "Wpald"].toString() : "";
+        root["poiu" + "Yt"] ? root["poiu" + "Yt"].toString() : "";
+
+        root["random" + "property"] ? root["random" + "property"].toString() : "";
+        root["cos" + "property"] ? root["cos" + "property"].toString() : "";
+        root["cos" + "sin"] ? root["cos" + "sin"].toString() : "";
+        root["property" + "cos"] ? root["property" + "cos"].toString() : "";
+        root["cos" + ""] ? root["cos" + ""].toString() : "";
+        root["" + "cos"] ? root["" + "cos"].toString() : "";
+        root["kq" + "wpald"] ? root["kq" + "wpald"].toString() : "";
+        root["poiu" + "yt"] ? root["poiu" + "yt"].toString() : "";
+    }
+}

diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 55b76f1..963bec9 100644 (file)
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -281,6 +281,7 @@ private slots:
     void overrideDataAssert();
     void fallbackBindings_data();
     void fallbackBindings();
+    void concatenatedStringPropertyAccess();
 
 private:
     static void propertyVarWeakRefCallback(v8::Persistent<v8::Value> object, void* parameter);
@@ -7280,6 +7281,15 @@ void tst_qqmlecmascript::sequenceSort()
     delete object;
 }
 
+void tst_qqmlecmascript::concatenatedStringPropertyAccess()
+{
+    QQmlComponent component(&engine, testFileUrl("concatenatedStringPropertyAccess.qml"));
+    QObject *object = component.create();
+    QVERIFY(object);
+    QVERIFY(object->property("success").toBool());
+    delete object;
+}
+
 QTEST_MAIN(tst_qqmlecmascript)
 
 #include "tst_qqmlecmascript.moc"