Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Catch possible exceptions when accessing window.localStorage 

Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/899

This is a code review of previous commits related to
the above issue.
This commit is contained in:
Raymond Hill 2020-03-03 11:31:14 -05:00
parent 39dc88b8f5
commit 08d370d32e
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
platform/chromium/vapi-common.js
View File

@ -246,23 +246,22 @@ vAPI.localStorage = {
this.cache = new Promise(resolve => {
browser.storage.local.get('localStorage', bin => {
this.cache = undefined;
if (
bin instanceof Object === false ||
bin.localStorage instanceof Object === false
) {
this.cache = {};
const ls = self.localStorage;
for ( let i = 0; i < ls.length; i++ ) {
const key = ls.key(i);
this.cache[key] = ls.getItem(key);
}
//ls.clear();
browser.storage.local.set({ localStorage: this.cache });
} else {
try {
try {
if (
bin instanceof Object === false ||
bin.localStorage instanceof Object === false
) {
this.cache = {};
const ls = self.localStorage;
for ( let i = 0; i < ls.length; i++ ) {
const key = ls.key(i);
this.cache[key] = ls.getItem(key);
}
browser.storage.local.set({ localStorage: this.cache });
} else {
this.cache = bin.localStorage;
} catch(ex) {
}
} catch(ex) {
}
if ( this.cache instanceof Object === false ) {
this.cache = {};