mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-02 10:00:54 +00:00
Fix so JSNewResolveOp can define id in an unrelated object and return it (not needed now for 274784, may be useful later, good for js, r=shaver).
This commit is contained in:
parent
db9fbee649
commit
67a8f727f7
@ -2542,7 +2542,10 @@ js_LookupPropertyWithFlags(JSContext *cx, JSObject *obj, jsid id, uintN flags,
|
||||
if (scope->object == obj2)
|
||||
sprop = SCOPE_GET_PROPERTY(scope, id);
|
||||
}
|
||||
if (obj2 != obj && !sprop) {
|
||||
if (sprop) {
|
||||
JS_ASSERT(obj2 == scope->object);
|
||||
obj = obj2;
|
||||
} else if (obj2 != obj) {
|
||||
JS_UNLOCK_OBJ(cx, obj2);
|
||||
JS_LOCK_OBJ(cx, obj);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user