fix: do not crash on unescaped svg data uri (#1288)

webpack-contrib · Apr 9, 2021 · 4f289c5 · 4f289c5
1 parent dcce860
commit 4f289c5
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 9 deletions.
diff --git a/src/utils.js b/src/utils.js
@@ -98,10 +98,24 @@ function normalizeUrl(url, isStringValue) {
   }
 
   if (matchNativeWin32Path.test(url)) {
-    return decodeURI(normalizedUrl);
+    try {
+      normalizedUrl = decodeURI(normalizedUrl);
+    } catch (error) {
+      // Ignore
+    }
+
+    return normalizedUrl;
+  }
+
+  normalizedUrl = unescape(normalizedUrl);
+
+  try {
+    normalizedUrl = decodeURI(normalizedUrl);
+  } catch (error) {
+    // Ignore
   }
 
-  return decodeURI(unescape(normalizedUrl));
+  return normalizedUrl;
 }
 
 function requestify(url, rootContext) {