Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-07-08 12:57:57 +02:00
Code Issues Releases Wiki Activity

Allow re-entrance in abort-current-inline-script

Browse Source 
Related feedback:
- https://github.com/DandelionSprout/adfilt/issues/7#issuecomment-590391877

If a property is already trapped with a getter/setter,
propagate to these after validation succeed.
This commit is contained in:
Raymond Hill 2020-02-24 13:40:17 -05:00
parent 60348c4624
commit 034c915f3b
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
assets/resources/scriptlets.js
View File

@ -56,12 +56,13 @@
if ( owner instanceof Object === false ) { return; } if ( owner instanceof Object === false ) { return; }
} }
let value; let value;
const desc = Object.getOwnPropertyDescriptor(owner, prop); let desc = Object.getOwnPropertyDescriptor(owner, prop);
if ( if (
desc instanceof Object === false || desc instanceof Object === false ||
desc.get instanceof Function === false desc.get instanceof Function === false
) { ) {
value = owner[prop]; value = owner[prop];
desc = undefined;
} }
const magic = String.fromCharCode(Date.now() % 26 + 97) + const magic = String.fromCharCode(Date.now() % 26 + 97) +
Math.floor(Math.random() * 982451653 + 982451653).toString(36); Math.floor(Math.random() * 982451653 + 982451653).toString(36);
@ -79,11 +80,17 @@
Object.defineProperty(owner, prop, { Object.defineProperty(owner, prop, {
get: function() { get: function() {
validate(); validate();
return value; return desc instanceof Object
? desc.get()
: value;
}, },
set: function(a) { set: function(a) {
validate(); validate();
value = a; if ( desc instanceof Object ) {
desc.set(a);
} else {
value = a;
}
} }
}); });
const oe = window.onerror; const oe = window.onerror;