From 8eec0518d628b59d4e6bfe3ee68ddabb1f83df08 Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Thu, 29 Dec 2011 10:32:52 +1000 Subject: Handle exceptions inside QV8QObjectConnectionList::qt_metacall Previously, exceptions were not handled in the connectionlist. This could cause v8 to assert under certain circumstances. Task-number: QTBUG-23375 Change-Id: Ie5f043b50bb6b02a77be464ca18ea8e3bbb0f501 Reviewed-by: Alan Alpert --- .../qobjectConnectionListExceptionHandling.qml | 24 ++++++++++++++++++++++ .../tst_qdeclarativeecmascript.cpp | 15 ++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/qobjectConnectionListExceptionHandling.qml (limited to 'tests') diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/qobjectConnectionListExceptionHandling.qml b/tests/auto/declarative/qdeclarativeecmascript/data/qobjectConnectionListExceptionHandling.qml new file mode 100644 index 0000000000..acd512a2be --- /dev/null +++ b/tests/auto/declarative/qdeclarativeecmascript/data/qobjectConnectionListExceptionHandling.qml @@ -0,0 +1,24 @@ +import QtQuick 2.0 + +Item { + id: root + property int first: 5 + property bool test: false + + Item { + id: exceptional + function exceptionalFunction() { + var obj = undefined; + var prop = undefined; + return obj[prop]; + } + } + + Component.onCompleted: { + root["firstChanged"].connect(exceptional.exceptionalFunction); + root["firstChanged"].connect(exceptional.exceptionalFunction); + root["firstChanged"].connect(exceptional.exceptionalFunction); + first = 6; + test = true; + } +} diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index 0e3cfd8970..05e14cfc94 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -199,6 +199,7 @@ private slots: void qtbug_11606(); void qtbug_11600(); void qtbug_21864(); + void qobjectConnectionListExceptionHandling(); void nonscriptable(); void deleteLater(); void in(); @@ -5181,6 +5182,20 @@ void tst_qdeclarativeecmascript::qtbug_21864() delete o; } +void tst_qdeclarativeecmascript::qobjectConnectionListExceptionHandling() +{ + // QTBUG-23375 + QDeclarativeComponent component(&engine, testFileUrl("qobjectConnectionListExceptionHandling.qml")); + QString warning = component.url().toString() + QLatin1String(":13: TypeError: Cannot read property 'undefined' of undefined"); + QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); + QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); + QTest::ignoreMessage(QtWarningMsg, qPrintable(warning)); + QObject *o = component.create(); + QVERIFY(o != 0); + QCOMPARE(o->property("test").toBool(), true); + delete o; +} + // Reading and writing non-scriptable properties should fail void tst_qdeclarativeecmascript::nonscriptable() { -- cgit v1.2.3