From ed45773caf76455bb737da3c0c4429f99c9a15ad Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 11 Mar 2014 09:18:17 +0100 Subject: Fix recursive calling of QScriptProgram The first time a QScriptProgram is evaluated, it gets compiled and then executed. If the execution would somehow trigger another evaluation of the script program, it would run into the compile stage again (even though it already was compiled), and then trigger and assertion in debug mode (or leak memory in release builds). Backport of 08d9ef715265d33f4cf04693b0787fd75994dc42 from Qt 5. Task-number: QTBUG-37317 Change-Id: I83e7efd5f238d021e200258826e2e4a9520c3a7d Reviewed-by: Simon Hausmann --- src/3rdparty/javascriptcore/JavaScriptCore/runtime/Executable.h | 2 ++ src/script/api/qscriptengine.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Executable.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Executable.h index d1d38de..53945e8 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Executable.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Executable.h @@ -172,6 +172,8 @@ namespace JSC { JSObject* compile(ExecState*, ScopeChainNode*); + bool isCompiled() const { return m_evalCodeBlock; } + ExceptionInfo* reparseExceptionInfo(JSGlobalData*, ScopeChainNode*, CodeBlock*); static PassRefPtr create(ExecState* exec, const SourceCode& source) { return adoptRef(new EvalExecutable(exec, source)); } diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 16c6b76..8b7e01b 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -1359,7 +1359,7 @@ JSC::JSValue QScriptEnginePrivate::evaluateHelper(JSC::ExecState *exec, intptr_t q->clearExceptions(); JSC::DynamicGlobalObjectScope dynamicGlobalObjectScope(exec, exec->scopeChain()->globalObject); - if (compile) { + if (compile && !executable->isCompiled()) { JSC::JSObject* error = executable->compile(exec, exec->scopeChain()); if (error) { compile = false; -- cgit v0.12