external/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-10 17:17:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

Mind \b in regex-based filters when trying to extract token

Browse source 
Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/1145#issuecomment-657036902
This commit is contained in:
Raymond Hill 2020-07-11 10:32:04 -04:00
parent 16e066e844
commit fc84a30cce
No known key found for this signature in database
GPG key ID: 25E1490B761470C2
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/js/static-net-filtering.js
View file

@ -2521,16 +2521,27 @@ const FilterParser = class {
// https://github.com/gorhill/uBlock/issues/2781
// For efficiency purpose, try to extract a token from
// a regex-based filter.
// https://github.com/uBlockOrigin/uBlock-issues/issues/1145#issuecomment-657036902
// Mind `\b` directives: `/\bads\b/` should result in token being `ads`,
// not `bads`.
extractTokenFromRegex() {
this.reRegexToken.lastIndex = 0;
const s = this.pattern;
let matches;
while ( (matches = this.reRegexToken.exec(s)) !== null ) {
const prefix = s.slice(0, matches.index);
let token = matches[0];
let prefix = s.slice(0, matches.index);
if ( this.reRegexTokenAbort.test(prefix) ) { return; }
if ( token.startsWith('b') ) {
const match = /\\+$/.exec(prefix);
if ( match !== null && (match[0].length & 1) !== 0 ) {
prefix += 'b';
token = token.slice(1);
}
}
if (
this.reRegexBadPrefix.test(prefix) || (
matches[0].length < this.maxTokenLen &&
token.length < this.maxTokenLen &&
this.reRegexBadSuffix.test(
s.slice(this.reRegexToken.lastIndex)
)
@ -2538,7 +2549,7 @@ const FilterParser = class {
) {
continue;
}
this.token = matches[0].toLowerCase();
this.token = token.toLowerCase();
this.tokenHash = urlTokenizer.tokenHashFromString(this.token);
this.tokenBeg = matches.index;
if ( this.badTokens.has(this.token) === false ) { break; }