diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-12-08 21:12:11 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2012-12-12 11:38:19 +0100 |
| commit | fc9e8852c3d2b323b119c9151f13c41bc932608f (patch) | |
| tree | dd81c3c51b5998e3f4666aea0454c5ddb170f2e8 /qmljs_environment.cpp | |
| parent | 2d8bd32e5d0072213db9f2a3cf3e33589b7a9c05 (diff) | |
Avoid uninitialized ExecutionContext::current pointer
Change-Id: I63fb1fbb39786fc349ccc121a25951b15ec31d57
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'qmljs_environment.cpp')
| -rw-r--r-- | qmljs_environment.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/qmljs_environment.cpp b/qmljs_environment.cpp index caf891566d..2a49a67588 100644 --- a/qmljs_environment.cpp +++ b/qmljs_environment.cpp @@ -385,6 +385,7 @@ void ExecutionContext::initCallContext(ExecutionContext *parent, const Value tha engine = parent->engine; this->parent = parent; + engine->current = this; function = f; strictMode = f->strictMode; @@ -429,7 +430,9 @@ void ExecutionContext::leaveCallContext() delete[] locals; locals = 0; } + engine->current = parent; parent = 0; + function = 0; if (engine->debugger) engine->debugger->justLeft(this); |