From 4684c2b54f7464e1828bcc5b5a1f997ec315f6f6 Mon Sep 17 00:00:00 2001
From: Kent Hansen <khansen@trolltech.com>
Date: Tue, 23 Jun 2009 09:50:24 +0200
Subject: toObject({undefined,null}) should return invalid scriptvalue

JSC will throw an error.
---
 src/script/api/qscriptengine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 873091b..857019e 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -2468,7 +2468,7 @@ QScriptValue QScriptEngine::toObject(const QScriptValue &value)
 {
     Q_D(QScriptEngine);
     JSC::JSValue jscValue = d->scriptValueToJSCValue(value);
-    if (!jscValue)
+    if (!jscValue || jscValue.isUndefined() || jscValue.isNull())
         return QScriptValue();
     JSC::ExecState* exec = d->globalObject->globalExec();
     JSC::JSValue result = jscValue.toObject(exec);
-- 
cgit v0.12