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

Fix severe regression causing infinite loop in new parser 

Related feedback:
- https://www.reddit.com/r/uBlockOrigin/comments/10l2jjr/help_latest_ubo_developer_version_is_not_working/
- https://github.com/uBlockOrigin/uBlock-issues/issues/2469
This commit is contained in:
Raymond Hill 2023-01-25 18:05:06 -05:00
parent b3f9a87ed8
commit c600cbbd3a
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1489,6 +1489,7 @@ export class AstFilterParser {
} }
getNetOptionValue(type) { getNetOptionValue(type) {
if ( this.nodeTypeRegister.includes(type) === false ) { return ''; }
const optionNode = this.nodeTypeLookupTable[type]; const optionNode = this.nodeTypeLookupTable[type];
if ( optionNode === 0 ) { return ''; } if ( optionNode === 0 ) { return ''; }
const valueNode = this.findDescendantByType(optionNode, NODE_TYPE_NET_OPTION_VALUE); const valueNode = this.findDescendantByType(optionNode, NODE_TYPE_NET_OPTION_VALUE);

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

@ -3336,15 +3336,16 @@ class FilterCompiler {
this.processMethodOption(parser.getNetOptionValue(id)); this.processMethodOption(parser.getNetOptionValue(id));
this.optionUnitBits |= this.METHOD_BIT; this.optionUnitBits |= this.METHOD_BIT;
break; break;
case sfp.NODE_TYPE_NET_OPTION_NAME_REDIRECT: case sfp.NODE_TYPE_NET_OPTION_NAME_REDIRECT: {
if ( this.action === AllowAction ) { const actualId = this.action === AllowAction
id = sfp.NODE_TYPE_NET_OPTION_NAME_REDIRECTRULE; ? sfp.NODE_TYPE_NET_OPTION_NAME_REDIRECTRULE
} : id;
if ( this.processModifierOption(id, parser.getNetOptionValue(id)) === false ) { if ( this.processModifierOption(actualId, parser.getNetOptionValue(id)) === false ) {
return false; return false;
} }
this.optionUnitBits |= this.REDIRECT_BIT; this.optionUnitBits |= this.REDIRECT_BIT;
break; break;
}
case sfp.NODE_TYPE_NET_OPTION_NAME_REDIRECTRULE: case sfp.NODE_TYPE_NET_OPTION_NAME_REDIRECTRULE:
if ( this.processModifierOption(id, parser.getNetOptionValue(id)) === false ) { if ( this.processModifierOption(id, parser.getNetOptionValue(id)) === false ) {
return false; return false;