Fix look-up of specific-generic filters entity-less hostnames

Related feedback: - uBlockOrigin/uBlock-issues#688 (comment)
gorhill · Dec 14, 2020 · b22cf24 · b22cf24
1 parent c45b93a
commit b22cf24
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/js/html-filtering.js b/src/js/html-filtering.js
@@ -368,12 +368,14 @@
             hostname,
             [ plains, exceptions, procedurals, exceptions ]
         );
-        if ( details.entity !== '' ) {
-            filterDB.retrieve(
-                `${hostname.slice(0, -details.domain.length)}${details.entity}`,
-                [ plains, exceptions, procedurals, exceptions ]
-            );
-        }
+        const entity = details.entity !== ''
+            ? `${hostname.slice(0, -details.domain.length)}${details.entity}`
+            : '*';
+        filterDB.retrieve(
+            entity,
+            [ plains, exceptions, procedurals, exceptions ],
+            1
+        );
 
         if ( plains.size === 0 && procedurals.size === 0 ) { return; }
 

diff --git a/src/js/scriptlet-filtering.js b/src/js/scriptlet-filtering.js
@@ -318,12 +318,10 @@
             sessionScriptletDB.retrieve([ null, $exceptions ]);
         }
         scriptletDB.retrieve(hostname, [ $scriptlets, $exceptions ]);
-        if ( request.entity !== '' ) {
-            scriptletDB.retrieve(
-                `${hostname.slice(0, -request.domain.length)}${request.entity}`,
-                [ $scriptlets, $exceptions ]
-            );
-        }
+        const entity = request.entity !== ''
+            ? `${hostname.slice(0, -request.domain.length)}${request.entity}`
+            : '*';
+        scriptletDB.retrieve(entity, [ $scriptlets, $exceptions ], 1);
         if ( $scriptlets.size === 0 ) { return; }
 
         const loggerEnabled = µb.logger.enabled;