From 115f7bb68704c4fede763cbc2d07f1caf041274f Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Mon, 26 Sep 2022 22:27:50 -0400
Subject: [PATCH] Fix operator token-to-ctor map

Related issue:
- https://github.com/uBlockOrigin/uBlock-issues/issues/2294
---
 assets/resources/scriptlets.js                | 78 +++++++++++++++++++
 src/js/html-filtering.js                      | 20 ++---
 .../googletagservices_gpt.js                  |  1 +
 3 files changed, 89 insertions(+), 10 deletions(-)

diff --git a/assets/resources/scriptlets.js b/assets/resources/scriptlets.js
index 5055840c7..3dce4db68 100644
--- a/assets/resources/scriptlets.js
+++ b/assets/resources/scriptlets.js
@@ -1740,6 +1740,84 @@
 
 
 
+/// m3u-prune.js
+// https://en.wikipedia.org/wiki/M3U
+(function() {
+    let m3uPattern = '{{1}}';
+    if ( m3uPattern === '{{1}}' ) {
+        m3uPattern = '';
+    }
+    let urlPattern = '{{2}}';
+    if ( urlPattern === '{{2}}' ) {
+        urlPattern = '';
+    }
+    const regexFromArg = arg => {
+        if ( arg === '' ) { return /^/; }
+        if ( /^\/.*\/$/.test(arg) ) { return new RegExp(arg.slice(1, -1)); }
+        return new RegExp(arg.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+    };
+    const reM3u = regexFromArg(m3uPattern);
+    const reUrl = regexFromArg(urlPattern);
+    const pruner = text => {
+        if ( (/^\s*#EXTM3U/.test(text)) === false ) { return text; }
+        const toRemove = new Set();
+        const lines = text.trim().split(/\n\r|\n|\r/);
+        for ( let i = 0; i < lines.length; i++ ) {
+            const line = lines[i];
+            if ( reM3u.test(line) === false ) { continue; }
+            if ( i === 0 || /^#EXTINF\b/.test(lines[i-1]) === false ) { continue; }
+            toRemove.add(i-1).add(i);
+            if ( /^#EXT-X-DISCONTINUITY\b/.test(lines[i+1]) === false) { continue; }
+            toRemove.add(i+1);
+            i += 1;
+        }
+        if ( toRemove.size === 0 ) { return text; }
+        return lines.filter((l, i) => toRemove.has(i) === false).join('\n');
+    };
+    const urlFromArg = arg => {
+        if ( typeof arg === 'string' ) { return arg; }
+        if ( arg instanceof Request ) { return arg.url; }
+        return String(arg);
+    };
+    const realFetch = self.fetch;
+    self.fetch = new Proxy(self.fetch, {
+        apply: function(target, thisArg, args) {
+            if ( reUrl.test(urlFromArg(args[0])) === false ) {
+                return Reflect.apply(target, thisArg, args);
+            }
+            return realFetch(...args).then(realResponse =>
+                realResponse.text().then(text =>
+                    new Response(pruner(text), {
+                        status: realResponse.status,
+                        statusText: realResponse.statusText,
+                        headers: realResponse.headers,
+                    })
+                )
+            );
+        }
+    });
+    self.XMLHttpRequest.prototype.open = new Proxy(self.XMLHttpRequest.prototype.open, {
+        apply: async (target, thisArg, args) => {
+            if ( reUrl.test(urlFromArg(args[1])) === false ) {
+                return Reflect.apply(target, thisArg, args);
+            }
+            thisArg.addEventListener('readystatechange', function() {
+                if ( thisArg.readyState !== 4 ) { return; }
+                const type = thisArg.responseType;
+                if ( type !== '' && type !== 'text' ) { return; }
+                const textin = thisArg.responseText;
+                const textout = pruner(textin);
+                if ( textout === textin ) { return; }
+                Object.defineProperty(thisArg, 'response', { value: textout, writable: true });
+                Object.defineProperty(thisArg, 'responseText', { value: textout, writable: true });
+            });
+            return Reflect.apply(target, thisArg, args);
+        }
+    });
+})();
+
+
+
 // These lines below are skipped by the resource parser.
 // <<<< end of private namespace
 })();
diff --git a/src/js/html-filtering.js b/src/js/html-filtering.js
index 66d8460a2..03b341884 100644
--- a/src/js/html-filtering.js
+++ b/src/js/html-filtering.js
@@ -232,16 +232,16 @@ const PSelector = class {
     }
 };
 PSelector.prototype.operatorToTaskMap = new Map([
-    [ ':has', PSelectorIfTask ],
-    [ ':has-text', PSelectorHasTextTask ],
-    [ ':if', PSelectorIfTask ],
-    [ ':if-not', PSelectorIfNotTask ],
-    [ ':min-text-length', PSelectorMinTextLengthTask ],
-    [ ':not', PSelectorIfNotTask ],
-    [ ':nth-ancestor', PSelectorUpwardTask ],
-    [ ':spath', PSelectorSpathTask ],
-    [ ':upward', PSelectorUpwardTask ],
-    [ ':xpath', PSelectorXpathTask ],
+    [ 'has', PSelectorIfTask ],
+    [ 'has-text', PSelectorHasTextTask ],
+    [ 'if', PSelectorIfTask ],
+    [ 'if-not', PSelectorIfNotTask ],
+    [ 'min-text-length', PSelectorMinTextLengthTask ],
+    [ 'not', PSelectorIfNotTask ],
+    [ 'nth-ancestor', PSelectorUpwardTask ],
+    [ 'spath', PSelectorSpathTask ],
+    [ 'upward', PSelectorUpwardTask ],
+    [ 'xpath', PSelectorXpathTask ],
 ]);
 PSelector.prototype.invalid = false;
 
diff --git a/src/web_accessible_resources/googletagservices_gpt.js b/src/web_accessible_resources/googletagservices_gpt.js
index 258a422a1..b8eae00b1 100644
--- a/src/web_accessible_resources/googletagservices_gpt.js
+++ b/src/web_accessible_resources/googletagservices_gpt.js
@@ -85,6 +85,7 @@
         setForceSafeFrame: noopthisfn,
         setLocation: noopthisfn,
         setPublisherProvidedId: noopthisfn,
+        setPrivacySettings: noopthisfn,
         setRequestNonPersonalizedAds: noopthisfn,
         setSafeFrameConfig: noopthisfn,
         setTagForChildDirectedTreatment: noopthisfn,