diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-10-22 13:26:08 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-29 10:39:01 +0100 |
commit | ffcdbfa03f8bb36b521f8c1a703ee24085fe25bd (patch) | |
tree | ddee0370444a4f71cabb7847e7f1eb758622bd9f /src/qml/jsruntime/qv4engine.cpp | |
parent | af22149dd8daf593182fec978f15dc1667c9cf8d (diff) |
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 <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index cf39d7df4f..bb11011669 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -808,7 +808,13 @@ QmlExtensions *ExecutionEngine::qmlExtensions() ReturnedValue ExecutionEngine::throwException(const ValueRef value) { -// Q_ASSERT(!hasException); + // we can get in here with an exception already set, as the runtime + // doesn't check after every operation that can throw. + // in this case preserve the first exception to give correct error + // information + if (hasException) + return Encode::undefined(); + hasException = true; exceptionValue = value; QV4::Scope scope(this); |