make QScriptContext::setScope() fail for object created in other engine

Also fix some autotest failures, improve the descriptions of failures,
and make the tests run to completion.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/script/api/qscriptcontext.cpp b/src/script/api/qscriptcontext.cpp
index d6440b0..669002d 100644
--- a/src/script/api/qscriptcontext.cpp
+++ b/src/script/api/qscriptcontext.cpp
@@ -654,6 +654,12 @@ void QScriptContext::pushScope(const QScriptValue &object)
 {
     if (!object.isObject())
         return;
+    else if (object.engine() != engine()) {
+        qWarning("QScriptContext::pushScope() failed: "
+                 "cannot push an object created in "
+                 "a different engine");
+        return;
+    }
     JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this);
     JSC::JSValue jscObject = QScript::scriptEngineFromExec(frame)->scriptValueToJSCValue(object);
     frame->setScopeChain(frame->scopeChain()->push(JSC::asObject(jscObject)));