push the right object when the argument is the Global Object

Since the internal Global Object is never exposed to the public, we
need to do like we do in setActivationObject(): if the object passed
is the Global Object proxy, use the internal Global Object as the
"real" argument. (JSC requires that the initial object pushed onto
the scope chain is an instance of JSC::JSGlobalObject, and the
Global Object proxy is not; hence, we can't push the proxy.)

1 files changed, 13 insertions, 4 deletions

diff --git a/src/script/api/qscriptcontext.cpp b/src/script/api/qscriptcontext.cpp
index 75ad505..e213f3b 100644
--- a/src/script/api/qscriptcontext.cpp
+++ b/src/script/api/qscriptcontext.cpp
@@ -711,13 +711,22 @@ void QScriptContext::pushScope(const QScriptValue &object)
         return;
     }
     JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this);
-    JSC::JSValue jscObject = QScript::scriptEngineFromExec(frame)->scriptValueToJSCValue(object);
+    QScriptEnginePrivate *engine = QScript::scriptEngineFromExec(frame);
+    JSC::JSObject *jscObject = JSC::asObject(engine->scriptValueToJSCValue(object));
+    if (jscObject == engine->originalGlobalObjectProxy)
+        jscObject = engine->originalGlobalObject();
     JSC::ScopeChainNode *scope = frame->scopeChain();
     Q_ASSERT(scope != 0);
-    if (!scope->object) // pushing to an "empty" chain
-        scope->object = JSC::asObject(jscObject);
+    if (!scope->object) {
+        // pushing to an "empty" chain
+        if (!jscObject->isGlobalObject()) {
+            qWarning("QScriptContext::pushScope() failed: initial object in scope chain has to be the Global Object");
+            return;
+        }
+        scope->object = jscObject;
+    }
     else
-        frame->setScopeChain(scope->push(JSC::asObject(jscObject)));
+        frame->setScopeChain(scope->push(jscObject));
 }
 
 /*!