Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-31 21:21:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1076597 - Fix Settings API shutdown race condition. r=bent

Browse Source
This commit is contained in:
Alexandre Lissy 2014-10-07 06:35:00 -04:00
parent 9261b9ccdd
commit 343378644a
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dom/settings/SettingsRequestManager.jsm
View File

@ -743,20 +743,33 @@ let SettingsRequestManager = {
}
},
removeMessageManager: function(aMsgMgr){
removeMessageManager: function(aMsgMgr, aPrincipal) {
if (DEBUG) debug("Removing message manager");
this.removeObserver(aMsgMgr);
let closedLockIDs = [];
let lockIDs = Object.keys(this.lockInfo);
for (let i in lockIDs) {
if (this.lockInfo[lockIDs[i]]._mm == aMsgMgr) {
if (DEBUG) debug("Removing lock " + lockIDs[i] + " due to process close/crash");
closedLockIDs.push(lockIDs[i]);
let lock = this.lockInfo[lockIDs[i]];
if (lock._mm == aMsgMgr) {
let is_finalizing = false;
for (let task_index in lock.tasks) {
if (lock.tasks[task_index].operation === "finalize") {
is_finalizing = true;
break;
}
}
if (!is_finalizing) {
this.queueTask("finalize", {lockID: lockIDs[i]}, aPrincipal).then(
function() {
if (DEBUG) debug("Lock " + lockIDs[i] + " with dead message manager finalized");
},
function(error) {
if (DEBUG) debug("Lock " + lockIDs[i] + " with dead message manager NOT FINALIZED due to error: " + error);
}
);
}
}
}
for (let i in closedLockIDs) {
this.removeLock(closedLockIDs[i]);
}
},
receiveMessage: function(aMessage) {
@ -812,7 +825,7 @@ let SettingsRequestManager = {
switch (aMessage.name) {
case "child-process-shutdown":
if (DEBUG) debug("Child process shutdown received.");
this.removeMessageManager(mm);
this.removeMessageManager(mm, aMessage.principal);
break;
case "Settings:RegisterForMessages":
if (!SettingsPermissions.hasSomeReadPermission(aMessage.principal)) {