Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-10-04 08:37:11 +02:00
Code Issues Releases Wiki Activity

Code review: ensure vAPI.shutdown.exec is called from root context only

Browse Source 
This prevents uncaught errors in content scripts when uBO's main
process is terminated (i.e. disabled, updated).
This commit is contained in:
Raymond Hill 2019-01-28 16:16:52 -05:00
parent a6ebcc85be
commit 920eee88be
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
platform/chromium/vapi-client.js
View File

@ -53,10 +53,15 @@ vAPI.shutdown = {
this.jobs.push(job);
},
exec: function() {
let job;
while ( (job = this.jobs.pop()) ) {
job();
}
// Shutdown asynchronously, to ensure shutdown jobs are called from
// the top context.
self.requestIdleCallback(( ) => {
const jobs = this.jobs.slice();
this.jobs.length = 0;
while ( jobs.length !== 0 ) {
(jobs.pop())();
}
});
},
remove: function(job) {
let pos;
@ -238,16 +243,20 @@ vAPI.messaging = {
} catch (ex) {
this.port = null;
}
if ( this.port !== null ) {
this.port.onMessage.addListener(this.messageListenerCallback);
this.port.onDisconnect.addListener(this.disconnectListenerBound);
this.portTimerDelay = 10000;
if ( this.portTimer === null ) {
this.portTimer = vAPI.setTimeout(
this.portPollerBound,
this.portTimerDelay
);
}
// Not having a valid port at this point means the main process is
// not available: no point keeping the content scripts alive.
if ( this.port === null ) {
vAPI.shutdown.exec();
return null;
}
this.port.onMessage.addListener(this.messageListenerCallback);
this.port.onDisconnect.addListener(this.disconnectListenerBound);
this.portTimerDelay = 10000;
if ( this.portTimer === null ) {
this.portTimer = vAPI.setTimeout(
this.portPollerBound,
this.portTimerDelay
);
}
return this.port;
},