Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-21 17:59:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1697774 - Avoid accessing cross-process contentWindow after navigation r=rpl

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D110338
This commit is contained in:
Tomislav Jovanovic 2021-04-03 16:38:39 +00:00
parent bc2d9d0d31
commit d97368f61c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
toolkit/components/extensions/ExtensionCommon.jsm
View File

@ -191,6 +191,10 @@ function makeWidgetId(id) {
return id.replace(/[^a-z0-9_-]/g, "_");
}
function isDeadOrRemote(obj) {
return Cu.isDeadWrapper(obj) || Cu.isRemoteProxy(obj);
}
/**
* A sentinel class to indicate that an array of values should be
* treated as an array when used as a promise resolution value, but as a
@ -399,7 +403,8 @@ class InnerWindowReference {
// pageshow listener was dispatched) or during the unload event.
if (
!this.needWindowIDCheck ||
getInnerWindowID(this.contentWindow) === this.innerWindowID
(!isDeadOrRemote(this.contentWindow) &&
getInnerWindowID(this.contentWindow) === this.innerWindowID)
) {
return this.contentWindow;
}
@ -410,7 +415,7 @@ class InnerWindowReference {
// If invalidate() is called while the inner window is in the bfcache, then
// we are unable to remove the event listener, and handleEvent will be
// called once more if the page is revived from the bfcache.
if (this.contentWindow && !Cu.isDeadWrapper(this.contentWindow)) {
if (this.contentWindow && !isDeadOrRemote(this.contentWindow)) {
this.contentWindow.removeEventListener("pagehide", this, {
mozSystemGroup: true,
});