Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-09 20:32:39 +01:00
Code Issues Releases Wiki Activity

Improve set-constant scriptlet

Browse Source 
Related feedback:
https://github.com/uBlockOrigin/uBlock-discussions/discussions/881#discussioncomment-10072370
This commit is contained in:
Raymond Hill 2024-07-17 09:36:55 -04:00
parent fd054176a8
commit 77feb25c4d
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
assets/resources/scriptlets.js
View File

@ -485,9 +485,8 @@ builtinScriptlets.push({
'safe-self.fn', 'safe-self.fn',
], ],
}); });
function validateConstantFn(trusted, raw) { function validateConstantFn(trusted, raw, extraArgs = {}) {
const safe = safeSelf(); const safe = safeSelf();
const extraArgs = safe.getExtraArgs(Array.from(arguments), 2);
let value; let value;
if ( raw === 'undefined' ) { if ( raw === 'undefined' ) {
value = undefined; value = undefined;
@ -587,7 +586,7 @@ function setConstantFn(
}; };
if ( trappedProp === '' ) { return; } if ( trappedProp === '' ) { return; }
const thisScript = document.currentScript; const thisScript = document.currentScript;
let normalValue = validateConstantFn(trusted, rawValue); let normalValue = validateConstantFn(trusted, rawValue, extraArgs);
if ( rawValue === 'noopFunc' || rawValue === 'trueFunc' || rawValue === 'falseFunc' ) { if ( rawValue === 'noopFunc' || rawValue === 'trueFunc' || rawValue === 'falseFunc' ) {
normalValue = cloakFunc(normalValue); normalValue = cloakFunc(normalValue);
} }
@ -4772,7 +4771,7 @@ function trustedReplaceArgument(
const logPrefix = safe.makeLogPrefix('trusted-replace-argument', propChain, argposRaw, argraw); const logPrefix = safe.makeLogPrefix('trusted-replace-argument', propChain, argposRaw, argraw);
const argpos = parseInt(argposRaw, 10) || 0; const argpos = parseInt(argposRaw, 10) || 0;
const extraArgs = safe.getExtraArgs(Array.from(arguments), 3); const extraArgs = safe.getExtraArgs(Array.from(arguments), 3);
const normalValue = validateConstantFn(true, argraw); const normalValue = validateConstantFn(true, argraw, extraArgs);
const reCondition = extraArgs.condition const reCondition = extraArgs.condition
? safe.patternToRegex(extraArgs.condition) ? safe.patternToRegex(extraArgs.condition)
: /^/; : /^/;