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

Consider an empty pattern with anchors to be dubious 

Related issue:
- https://github.com/ryanbr/fanboy-adblock/issues/1384
This commit is contained in:
Raymond Hill 2020-07-17 10:08:08 -04:00
parent 7b55f0fbf1
commit 3789259fc9
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/js/codemirror/ubo-static-filtering.js
View File

@ -252,16 +252,16 @@ CodeMirror.defineMode('ubo-static-filtering', function() {
if ( parser.category === parser.CATComment ) {
return colorCommentSpan(stream);
}
if ( (parser.slices[parserSlot] & parser.BITIgnore) !== 0 ) {
stream.pos += parser.slices[parserSlot+2];
parserSlot += 3;
return 'comment';
}
if ( (parser.slices[parserSlot] & parser.BITError) !== 0 ) {
stream.pos += parser.slices[parserSlot+2];
parserSlot += 3;
return 'error';
}
if ( (parser.slices[parserSlot] & parser.BITIgnore) !== 0 ) {
stream.pos += parser.slices[parserSlot+2];
parserSlot += 3;
return 'comment';
}
if ( parser.category === parser.CATStaticExtFilter ) {
return colorExtSpan(stream);
}

17
src/js/static-filtering-parser.js
View File

@ -636,7 +636,11 @@ const Parser = class {
this.toASCII(true) === false
)
) {
this.markSpan(this.patternSpan, BITError);
this.markSlices(
this.patternLeftAnchorSpan.i,
this.optionsAnchorSpan.i,
BITError
);
}
this.netOptionsIterator.init();
}
@ -908,12 +912,17 @@ const Parser = class {
// Examples of dubious filter content:
// - Spaces characters
// - Single character other than `*` wildcard
// - Zero-length pattern with anchors
// https://github.com/ryanbr/fanboy-adblock/issues/1384
patternIsDubious() {
return hasBits(this.patternBits, BITSpace) || (
this.patternBits !== BITAsterisk &&
this.optionsSpan.len === 0 &&
this.patternSpan.len === 3 &&
this.slices[this.patternSpan.i+2] === 1
this.optionsSpan.len === 0 && (
this.patternSpan.len === 0 &&
this.patternLeftAnchorSpan.len !== 0 ||
this.patternSpan.len === 3 &&
this.slices[this.patternSpan.i+2] === 1
)
);
}