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

code review: be sure all invalid cosmetic filters are reported in logger

Browse source
This commit is contained in:
gorhill 2016-12-30 10:41:16 -05:00
parent c6dbdbd23b
commit 38a5f5751b
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/js/cosmetic-filtering.js
View file

@ -754,14 +754,15 @@ FilterContainer.prototype.compileSelector = (function() {
var matches;
// `:style` selector?
if ( (matches = reStyleSelector.exec(raw)) !== null ) {
if ( isValidCSSSelector(matches[1]) && isValidStyleProperty(matches[2]) ) {
return JSON.stringify({
raw: raw,
style: [ matches[1], '{' + matches[2] + '}' ]
});
}
return;
if (
(matches = reStyleSelector.exec(raw)) !== null &&
isValidCSSSelector(matches[1]) &&
isValidStyleProperty(matches[2])
) {
return JSON.stringify({
raw: raw,
style: [ matches[1], '{' + matches[2] + '}' ]
});
}
// `script:` filter?
@ -774,7 +775,6 @@ FilterContainer.prototype.compileSelector = (function() {
if ( reIsRegexLiteral.test(matches[2]) === false || isBadRegex(matches[2].slice(1, -1)) === false ) {
return raw;
}
return;
}
// Procedural selector?
@ -784,7 +784,6 @@ FilterContainer.prototype.compileSelector = (function() {
}
µb.logger.writeOne('', 'error', 'Cosmetic filtering – invalid filter: ' + raw);
return;
};
})();