From 2fae41a4e0376d93ceeeedd5e0014fab91473c23 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Sat, 1 Jun 2013 14:25:32 +0200 Subject: Fix uninitialized return value for QQmlJavaScriptExpression::evaluate In case of an exception, we'd return an uninitialized value. (visible when running tst_qqmlecmascript in valgrind) Change-Id: I2c95a112b09ba527e61088904fa7daff003be05d Reviewed-by: Lars Knoll --- src/qml/qml/qqmljavascriptexpression.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/qml/qqmljavascriptexpression.cpp') diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index 1d4bba66d2..863432bcc0 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -154,7 +154,7 @@ QQmlJavaScriptExpression::evaluate(QQmlContextData *context, // incase we have been deleted. DeleteWatcher watcher(this); - QV4::Value result; + QV4::Value result = QV4::Value::undefinedValue(); QV4::ExecutionEngine *v4 = QV8Engine::getV4(ep->v8engine()); QV4::ExecutionContext *ctx = v4->current; try { -- cgit v1.2.3