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

this fixes #997

This commit is contained in:
gorhill 2015-12-03 10:06:06 -05:00
parent a2f79952a2
commit 13f42051b2
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/js/static-net-filtering.js
View File

@ -212,7 +212,7 @@ var strToRegex = function(s, anchor, flags) {
if ( anchor < 0 ) { if ( anchor < 0 ) {
reStr = '^' + reStr; reStr = '^' + reStr;
} else if ( anchor > 0 ) { } else if ( anchor > 0 ) {
reStr += reStr + '$'; reStr += '$';
} }
//console.debug('µBlock.staticNetFilteringEngine: created RegExp("%s")', reStr); //console.debug('µBlock.staticNetFilteringEngine: created RegExp("%s")', reStr);
@ -1666,8 +1666,14 @@ var badTokens = {
var findFirstGoodToken = function(s) { var findFirstGoodToken = function(s) {
reGoodToken.lastIndex = 0; reGoodToken.lastIndex = 0;
var matches; var matches, lpos;
while ( (matches = reGoodToken.exec(s)) ) { while ( (matches = reGoodToken.exec(s)) ) {
// https://github.com/gorhill/uBlock/issues/997
// Ignore token if preceded by wildcard.
lpos = matches.index;
if ( lpos !== 0 && s.charAt(lpos - 1) === '*' ) {
continue;
}
if ( s.charAt(reGoodToken.lastIndex) === '*' ) { if ( s.charAt(reGoodToken.lastIndex) === '*' ) {
continue; continue;
} }
@ -1679,6 +1685,12 @@ var findFirstGoodToken = function(s) {
// No good token found, try again without minding "bad" tokens // No good token found, try again without minding "bad" tokens
reGoodToken.lastIndex = 0; reGoodToken.lastIndex = 0;
while ( (matches = reGoodToken.exec(s)) ) { while ( (matches = reGoodToken.exec(s)) ) {
// https://github.com/gorhill/uBlock/issues/997
// Ignore token if preceded by wildcard.
lpos = matches.index;
if ( lpos !== 0 && s.charAt(lpos - 1) === '*' ) {
continue;
}
if ( s.charAt(reGoodToken.lastIndex) === '*' ) { if ( s.charAt(reGoodToken.lastIndex) === '*' ) {
continue; continue;
} }