[INFER] Fixes from botched merge.

2011-03-03 21:24:13 -08:00
parent 81b4a51f7c
commit 08c135b748
5 changed files with 13 additions and 19 deletions
--- a/js/src/jsarray.cpp
+++ b/js/src/jsarray.cpp
@@ -2059,6 +2059,7 @@ js::array_sort(JSContext *cx, uintN argc, Value *vp)
        if (!JS_CHECK_OPERATION_LIMIT(cx) || DeleteArrayElement(cx, obj, --len, true) < 0)
            return false;
    }
+    vp->setObject(*obj);
    return true;
 }