Add 2990907-24.patch

core/lib/Drupal/Core/Asset/JsOptimizer.php

@@ -79,7 +79,7 @@ public function optimize(array $js_asset) {
    */
   public function clean($contents) {
     // Remove JS source and source mapping URLs or these may cause 404 errors.
-    $contents = preg_replace('/\/\/(#|@)\s(sourceURL|sourceMappingURL)=\s*(\S*?)\s*$/m', '', $contents);
+    $contents = preg_replace('~//[#@]\s(source(?:Mapping)?URL)=\s*(\S+)\s*~', '', $contents);
 
     return $contents;
   }

core/tests/Drupal/Tests/Core/Asset/JsOptimizerUnitTest.php

@@ -77,6 +77,35 @@ public function testClean($js_asset, $expected): void {
     $this->assertEquals($expected, $this->optimizer->clean($js_asset));
   }
 
+  /**
+   * Tests that the javascript may be cleaned without backtracking.
+   */
+  public function testCleanWithRecursionLimit() {
+    // Specify a hard backtracking limit.
+    ini_set('pcre.backtrack_limit', 100);
+    $backtrack_limit = (int) ini_get('pcre.backtrack_limit');
+    $this->assertEquals(100, $backtrack_limit);
+    $script = <<<JS
+(function($) { "use strict"; })
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,
+JS;
+    // Generate a source map URL that would exceed the backtrack limit.
+    $script .= str_repeat('x', $backtrack_limit);
+    // Add an empty space after the sourcemap, followed by other
+    // miscellaneous code.
+    $script .= <<<JS
+ // I appear after the sourcemap URL.
+(function($) { "use strict"; console.log('Hello'); })
+JS;
+    $expected_script = <<<JS
+(function($) { "use strict"; })
+// I appear after the sourcemap URL.
+(function($) { "use strict"; console.log('Hello'); })
+JS;
+
+    $this->assertEquals($expected_script, $this->optimizer->clean($script));
+  }
+
   /**
    * Provides data for the JS asset optimize test.
    *