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/qv4globalobject.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/qv4globalobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4globalobject.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4globalobject.cpp b/src/qml/jsruntime/qv4globalobject.cpp index 084b508b52..fca49308cc 100644 --- a/src/qml/jsruntime/qv4globalobject.cpp +++ b/src/qml/jsruntime/qv4globalobject.cpp @@ -469,6 +469,10 @@ ReturnedValue GlobalFunctions::method_parseInt(SimpleCallContext *ctx) // [15.1.2.2] step by step: String *inputString = string->toString(ctx); // 1 QString trimmed = inputString->toQString().trimmed(); // 2 + + if (ctx->engine->hasException) + return Encode::undefined(); + const QChar *pos = trimmed.constData(); const QChar *end = pos + trimmed.length(); |