Fix crash with when evaluating bindings with QQmlExpression that throw exceptions

We must handle a thrown exception and cannot pass the undefined value back to
QV8Engine::toVariant.

Change-Id: Ia466b175706dccd513895ef5bb166b811fbdc26b
Task-number: QTBUG-41860
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/tests/auto/qml/qqmlexpression/tst_qqmlexpression.cpp b/tests/auto/qml/qqmlexpression/tst_qqmlexpression.cpp
index f53ef82891..522fafe7af 100644
--- a/tests/auto/qml/qqmlexpression/tst_qqmlexpression.cpp
+++ b/tests/auto/qml/qqmlexpression/tst_qqmlexpression.cpp
@@ -47,6 +47,7 @@ public:
 private slots:
     void scriptString();
     void syntaxError();
+    void exception();
     void expressionFromDataComponent();
 };
 
@@ -109,6 +110,15 @@ void tst_qqmlexpression::syntaxError()
     QCOMPARE(v, QVariant());
 }
 
+void tst_qqmlexpression::exception()
+{
+    QQmlEngine engine;
+    QQmlExpression expression(engine.rootContext(), 0, "abc=123");
+    QVariant v = expression.evaluate();
+    QCOMPARE(v, QVariant());
+    QVERIFY(expression.hasError());
+}
+
 void tst_qqmlexpression::expressionFromDataComponent()
 {
     qmlRegisterType<TestObject>("Test", 1, 0, "TestObject");