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/qv4string.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/qv4string.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4string.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp index fd366d26ac..bd4e2b16b0 100644 --- a/src/qml/jsruntime/qv4string.cpp +++ b/src/qml/jsruntime/qv4string.cpp @@ -178,6 +178,8 @@ ReturnedValue String::getIndexed(Managed *m, uint index, bool *hasProperty) void String::put(Managed *m, const StringRef name, const ValueRef value) { Scope scope(m->engine()); + if (scope.hasException()) + return; ScopedString that(scope, static_cast<String *>(m)); Scoped<Object> o(scope, that->engine()->newStringObject(that)); o->put(name, value); @@ -186,6 +188,9 @@ void String::put(Managed *m, const StringRef name, const ValueRef value) void String::putIndexed(Managed *m, uint index, const ValueRef value) { Scope scope(m->engine()); + if (scope.hasException()) + return; + ScopedString that(scope, static_cast<String *>(m)); Scoped<Object> o(scope, that->engine()->newStringObject(that)); o->putIndexed(index, value); |