Trim end of class tokens in generic cosmetic filtering's surveyor

Related issue: uBlockOrigin/uBlock-issues#3257
gorhill · May 28, 2024 · 8ea1bac · 8ea1bac
1 parent ce7806e
commit 8ea1bac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/platform/mv3/extension/js/scripting/css-generic.js b/platform/mv3/extension/js/scripting/css-generic.js
@@ -89,8 +89,10 @@ const uBOL_classesFromNode = (node, out) => {
         end = s.indexOf(' ', beg);
         if ( end === beg ) { continue; }
         if ( end === -1 ) { end = len; }
-        out.push(hashFromStr(0x2E /* '.' */, s.slice(beg, end)));
+        const token = s.slice(beg, end).trimEnd();
         beg = end;
+        if ( token.length === 0 ) { continue; }
+        out.push(hashFromStr(0x2E /* '.' */, token));
     }
 };
 

diff --git a/src/js/contentscript.js b/src/js/contentscript.js
@@ -1016,8 +1016,10 @@ vAPI.DOMFilterer = class {
             end = s.indexOf(' ', beg);
             if ( end === beg ) { continue; }
             if ( end === -1 ) { end = len; }
-            const hash = hashFromStr(0x2E /* '.' */, s.slice(beg, end));
+            const token = s.slice(beg, end).trimEnd();
             beg = end;
+            if ( token.length === 0 ) { continue; }
+            const hash = hashFromStr(0x2E /* '.' */, token);
             if ( queriedHashes.has(hash) ) { continue; }
             queriedHashes.add(hash);
             out.push(hash);