Bug 1122913 - Remove object out-parameter from native LookupOwnProperty. r=jorendorff

2015-01-21 14:09:43 +01:00
parent 0a968e2311
commit 4c79a1c0d7
3 changed files with 28 additions and 46 deletions
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -2906,13 +2906,18 @@ js::NonProxyLookupOwnProperty(JSContext *cx, LookupGenericOp lookup,
            MaybeRooted<JSObject*, allowGC>::template downcastHandle<NativeObject>(obj);

        bool done;
-        if (!LookupOwnPropertyInline<allowGC>(cx, nobj, id, objp, propp, &done))
+        if (!LookupOwnPropertyInline<allowGC>(cx, nobj, id, propp, &done))
            return false;
        if (!done) {
            objp.set(nullptr);
            propp.set(nullptr);
            return true;
        }
+
+        if (propp)
+            objp.set(obj);
+        else
+            objp.set(nullptr);
    }

    if (!propp)