Fix a bug in the Object contructor

new Object(x) should convert x to an object and return
it if x is not null or undefined

Change-Id: Icb5547a23df83018757901bfecb5f024610e7c68
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/qv4ecmaobjects.cpp b/qv4ecmaobjects.cpp
index c9e0ea6..4774c78 100644 (file)
--- a/qv4ecmaobjects.cpp
+++ b/qv4ecmaobjects.cpp
@@ -531,7 +531,10 @@ ObjectCtor::ObjectCtor(ExecutionContext *scope)
 
 Value ObjectCtor::construct(ExecutionContext *ctx)
 {
-    ctx->thisObject = Value::fromObject(ctx->engine->newObject());
+    if (!ctx->argumentCount || ctx->argument(0).isUndefined() || ctx->argument(0).isNull())
+        ctx->thisObject = Value::fromObject(ctx->engine->newObject());
+    else
+        ctx->thisObject = __qmljs_to_object(ctx->argument(0), ctx);
     return ctx->thisObject;
 }