Merge pull request #1567 from yetingli/main

Fix ReDoS in previous-map
postcss · Apr 26, 2021 · 2b1d04c · 2b1d04c · abergmann · Apr 27, 2021
2 parents dc6cff1 + 2ad1ca9
commit 2b1d04c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/previous-map.js b/lib/previous-map.js
@@ -48,11 +48,11 @@ class PreviousMap {
   }
 
   getAnnotationURL(sourceMapString) {
-    return sourceMapString.match(/\/\*\s*# sourceMappingURL=(.*)\*\//)[1].trim()
+    return sourceMapString.match(/\/\*\s*# sourceMappingURL=((?:(?!sourceMappingURL=).)*)\*\//)[1].trim()
   }
 
   loadAnnotation(css) {
-    let annotations = css.match(/\/\*\s*# sourceMappingURL=.*\*\//gm)
+    let annotations = css.match(/\/\*\s*# sourceMappingURL=(?:(?!sourceMappingURL=).)*\*\//gm)
 
     if (annotations && annotations.length > 0) {
       // Locate the last sourceMappingURL to avoid picking up