wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 751858 - Actually throw when we deny access. r=bholley

Browse Source
This commit is contained in:
Blake Kaplan 2012-05-04 14:22:55 +02:00
parent aec24cbe16
commit f14f44ff14
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/xpconnect/wrappers/AccessCheck.cpp
View File

@ -455,12 +455,10 @@ ExposedPropertiesOnly::check(JSContext *cx, JSObject *wrapper, jsid id, Wrapper:
perm = PermitObjectAccess;
return true;
}
if (act == Wrapper::PUNCTURE) {
perm = DenyAccess;
return false;
}
perm = DenyAccess;
if (act == Wrapper::PUNCTURE)
return PermitIfUniversalXPConnect(cx, id, act, perm); // Deny
jsid exposedPropsId = GetRTIdByIndex(cx, XPCJSRuntime::IDX_EXPOSEDPROPS);

9
js/xpconnect/wrappers/AccessCheck.h
View File

@ -120,14 +120,13 @@ struct LocationPolicy : public Policy {
perm = DenyAccess;
// Location object security is complicated enough. Don't allow punctures.
if (act == js::Wrapper::PUNCTURE)
return false;
if (AccessCheck::isCrossOriginAccessPermitted(cx, wrapper, id, act) ||
AccessCheck::isLocationObjectSameOrigin(cx, wrapper)) {
if (act != js::Wrapper::PUNCTURE &&
(AccessCheck::isCrossOriginAccessPermitted(cx, wrapper, id, act) ||
AccessCheck::isLocationObjectSameOrigin(cx, wrapper))) {
perm = PermitPropertyAccess;
return true;
}
JSAutoEnterCompartment ac;
if (!ac.enter(cx, wrapper))
return false;