Bug 682298 - Calling shell-only clear() function with no arguments reads garbage. r=luke.

--HG--
extra : rebase_source : ac11611035f5ebfc0c3b898236f70f9e8d0205b8

js/src/shell/js.cpp

@@ -2666,11 +2666,16 @@ static JSBool
 Clear(JSContext *cx, uintN argc, jsval *vp)
 {
     JSObject *obj;
-    if (argc != 0 && !JS_ValueToObject(cx, JS_ARGV(cx, vp)[0], &obj))
-        return JS_FALSE;
+    if (argc == 0) {
+        obj = JS_GetGlobalForScopeChain(cx);
+        if (!obj)
+            return false;
+    } else if (!JS_ValueToObject(cx, JS_ARGV(cx, vp)[0], &obj)) {
+        return false;
+    }
     JS_ClearScope(cx, obj);
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
-    return JS_TRUE;
+    return true;
 }
 
 static JSBool