From e14b52af79bb9307a06a6a475e65c792dd13be2a Mon Sep 17 00:00:00 2001
From: tophf <extophf@gmail.com>
Date: Thu, 22 Aug 2024 12:18:09 +0300
Subject: [PATCH] fix 0195dff0: restore ";" before code, skip // comments

---
 src/background/utils/preinject.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/background/utils/preinject.js b/src/background/utils/preinject.js
index 63e2fe3909..349d75aad9 100644
--- a/src/background/utils/preinject.js
+++ b/src/background/utils/preinject.js
@@ -43,7 +43,7 @@ const API_EXTRA = [
 const findCspHeader = h => h.name.toLowerCase() === 'content-security-policy';
 const CSP_RE = /(?:^|[;,])\s*(?:script-src(-elem)?|(d)efault-src)(\s+[^;,]+)/g;
 const NONCE_RE = /'nonce-([-+/=\w]+)'/;
-const SAFE_IIFE_RE = /^\s*(?:\/\*[\s\S]*?\*\/\s*)*[!;]/u;
+const UNSAFE_CONCAT_RE = /^\s*(?:\/\*[\s\S]*?\*\/|\/\/.*[\r\n]+|\s+)*[-+[(]/u;
 const UNSAFE_INLINE = "'unsafe-inline'";
 /** These bags are reused in cache to reduce memory usage,
  * CACHE_KEYS is for removeStaleCacheEntry */
@@ -492,13 +492,16 @@ function prepareScript(script, env) {
     const req = require[pathMap[url] || url];
     if (/\S/.test(req)) {
       injectedCode.push(...[
-        tmp && !SAFE_IIFE_RE.test(req) && ';',
+        tmp && UNSAFE_CONCAT_RE.test(req) && ';',
         req,
         !NEWLINE_END_RE.test(req) && '\n',
       ].filter(Boolean));
       tmp = true;
     }
   }
+  if (tmp && UNSAFE_CONCAT_RE.test(code)) {
+    injectedCode.push(';');
+  }
   codeIndex = injectedCode.length;
   injectedCode.push(code);
   // adding a new line in case the code ends with a line comment