fix 0195dff: restore ";" before code, skip // comments

Xia0xia0Xia0 · Aug 22, 2024 · e14b52a · e14b52a
1 parent 51c9ee3
commit e14b52a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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