Fixed: Pipe in filter interpreted wrong when wildcards stripped away

lib/filterClasses.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 474 matching lines @@
   /**
    * Regular expression to be used when testing against this filter
    * @type RegExp
    */
   get regexp()
   {
     // Remove multiple wildcards
     let source = this.regexpSource.replace(/\*+/g, "*");
 
     // Remove leading wildcards
-    if (source[0] == "*")
+    let hasLeadingWildcard = (source[0] == "*");
+    if (hasLeadingWildcard)
       source = source.substr(1);
 
     // Remove trailing wildcards
     let pos = source.length - 1;
-    if (pos >= 0 && source[pos] == "*")
+    let hasTrailingWildcard = (pos >= 0 && source[pos] == "*");
+    if (hasTrailingWildcard)
       source = source.substr(0, pos);
 
-    source = source.replace(/\^\|$/, "^")       // remove anchors following separator placeholder
-                   .replace(/\W/g, "\\$&")    // escape special symbols
-                   .replace(/\\\*/g, ".*")      // replace wildcards by .*
-                   // process separator placeholders (all ANSI charaters but alphanumeric characters and _%.-)
-                   .replace(/\\\^/g, "(?:[\\x00-\\x24\\x26-\\x2C\\x2F\\x3A-\\x40\\x5B-\\x5E\\x60\\x7B-\\x80]|$)")
-                   .replace(/^\\\|\\\|/, "^[\\w\\-]+:\\/+(?!\\/)(?:[^.\\/]+\\.)*?") // process extended anchor at expression start
-                   .replace(/^\\\|/, "^")       // process anchor at expression start
-                   .replace(/\\\|$/, "$");      // process anchor at expression end
+    source = source.replace(/\^\|$/, "^") // remove anchors following separator placeholder
+                   .replace(/\W/g, "\\$&") // escape special symbols
+                   .replace(/\\\*/g, ".*") // replace wildcards by .*
+                   // process separator placeholders (all ANSI characters but alphanumeric characters and _%.-)
+                   .replace(/\\\^/g, "(?:[\\x00-\\x24\\x26-\\x2C\\x2F\\x3A-\\x40\\x5B-\\x5E\\x60\\x7B-\\x7F]|$)");
+    if (!hasLeadingWildcard)
+      source = source.replace(/^\\\|\\\|/, "^[\\w\\-]+:\\/+(?!\\/)(?:[^.\\/]+\\.)*?") // process extended anchor at expression start
+                     .replace(/^\\\|/, "^"); // process anchor at expression start
+    if (!hasTrailingWildcard)
+      source = source.replace(/\\\|$/, "$"); // process anchor at expression end

[Wladimir Palant, 2014/01/24 13:11:32]

This issue was introduced in the speedup here:
https://hg.adblockplus.org/adblockplus/rev/5161e5b4f7f8. Adding more branching
to this function likely eats away all the performance advantage gained. So I
guess a better solution is reverting the change there and processing
leading/trailing wildcards by regular expressions again - especially given that
regexp generation is happening delayed now and no longer plays a real role
performance-wise.

[Thomas Greiner, 2014/01/24 14:48:16]

Done. If we still want to optimize the performance we could precompile the
regular expressions.

 
     let regexp = new RegExp(source, this.matchCase ? "" : "i");
 
     delete this.regexpSource;
     this.__defineGetter__("regexp", function() regexp);
     return this.regexp;
   },
   /**
    * Content types the filter applies to, combination of values from RegExpFilter.typeMap
    * @type Number
@@ skipping 351 matching lines @@
 function ElemHideException(text, domains, selector)
 {
   ElemHideBase.call(this, text, domains, selector);
 }
 exports.ElemHideException = ElemHideException;
 
 ElemHideException.prototype =
 {
   __proto__: ElemHideBase.prototype
 };