From ffcdbfa03f8bb36b521f8c1a703ee24085fe25bd Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 22 Oct 2013 13:26:08 +0200 Subject: Protect write accesses to objects Don't write to objects if we have a pending exception to avoid any side effects. Change-Id: I9f93a9195a652dbae7033cc6ebb355d5d86e9b5e Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4qobjectwrapper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/jsruntime/qv4qobjectwrapper.cpp') diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp index a581e6bc69..acdfc1ba52 100644 --- a/src/qml/jsruntime/qv4qobjectwrapper.cpp +++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp @@ -627,7 +627,7 @@ void QObjectWrapper::put(Managed *m, const StringRef name, const ValueRef value) QObjectWrapper *that = static_cast(m); ExecutionEngine *v4 = m->engine(); - if (QQmlData::wasDeleted(that->m_object)) + if (v4->hasException || QQmlData::wasDeleted(that->m_object)) return; QQmlContextData *qmlContext = QV4::QmlContextWrapper::callingContext(v4); -- cgit v1.2.3