mirror of
https://github.com/gorhill/uBlock.git
synced 2024-09-04 10:09:38 +02:00
this fixes #1004
This commit is contained in:
parent
6b8118bb68
commit
b55a9458f1
@ -237,7 +237,9 @@ var FilterParser = function() {
|
||||
this.unhide = 0;
|
||||
this.hostnames = [];
|
||||
this.invalid = false;
|
||||
this.cosmetic = true;
|
||||
this.reParser = /^\s*([^#]*)(##|#@#)(.+)\s*$/;
|
||||
this.div = document.createElement('div');
|
||||
};
|
||||
|
||||
/******************************************************************************/
|
||||
@ -248,18 +250,31 @@ FilterParser.prototype.reset = function() {
|
||||
this.unhide = 0;
|
||||
this.hostnames.length = 0;
|
||||
this.invalid = false;
|
||||
this.cosmetic = true;
|
||||
return this;
|
||||
};
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
FilterParser.prototype.isValidSelector = function(s) {
|
||||
try {
|
||||
this.div.matches(s);
|
||||
} catch (e) {
|
||||
console.error('µBlock> invalid cosmetic filter:', s);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
};
|
||||
|
||||
/******************************************************************************/
|
||||
|
||||
FilterParser.prototype.parse = function(s) {
|
||||
// important!
|
||||
this.reset();
|
||||
|
||||
var matches = this.reParser.exec(s);
|
||||
if ( matches === null || matches.length !== 4 ) {
|
||||
this.invalid = true;
|
||||
this.cosmetic = false;
|
||||
return this;
|
||||
}
|
||||
|
||||
@ -272,7 +287,7 @@ FilterParser.prototype.parse = function(s) {
|
||||
// Any sequence of `#` longer than one means the line is not a valid
|
||||
// cosmetic filter.
|
||||
if ( this.suffix.indexOf('##') !== -1 ) {
|
||||
this.invalid = true;
|
||||
this.cosmetic = false;
|
||||
return this;
|
||||
}
|
||||
|
||||
@ -283,6 +298,13 @@ FilterParser.prototype.parse = function(s) {
|
||||
this.suffix = this.suffix.slice(1);
|
||||
}
|
||||
|
||||
// https://github.com/gorhill/uBlock/issues/1004
|
||||
// Detect and report invalid CSS selectors.
|
||||
if ( this.isValidSelector(this.suffix) === false ) {
|
||||
this.invalid = true;
|
||||
return this;
|
||||
}
|
||||
|
||||
this.unhide = matches[2].charAt(1) === '@' ? 1 : 0;
|
||||
if ( this.prefix !== '' ) {
|
||||
this.hostnames = this.prefix.split(/\s*,\s*/);
|
||||
@ -559,9 +581,12 @@ FilterContainer.prototype.reset = function() {
|
||||
|
||||
FilterContainer.prototype.compile = function(s, out) {
|
||||
var parsed = this.parser.parse(s);
|
||||
if ( parsed.invalid ) {
|
||||
if ( parsed.cosmetic === false ) {
|
||||
return false;
|
||||
}
|
||||
if ( parsed.invalid ) {
|
||||
return true;
|
||||
}
|
||||
|
||||
var hostnames = parsed.hostnames;
|
||||
var i = hostnames.length;
|
||||
|
Loading…
Reference in New Issue
Block a user