nodejs
diff --git a/‎benchmark/esm/get-data-protocol-format.js‎
Lines changed: 30 additions & 0 deletions b/‎benchmark/esm/get-data-protocol-format.js‎
Lines changed: 30 additions & 0 deletions
diff --git a/‎lib/internal/modules/esm/get_format.js‎
Lines changed: 1 addition & 1 deletion b/‎lib/internal/modules/esm/get_format.js‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/internal/modules/esm/load.js‎
Lines changed: 1 addition & 1 deletion b/‎lib/internal/modules/esm/load.js‎
Lines changed: 1 addition & 1 deletion
@@ -0,0 +1,30 @@
+// Benchmarks defaultGetFormat() on `data:` URLs. The MIME-matching regex used
+// to be susceptible to catastrophic backtracking on malformed input lacking a
+// `,` separator (https://github.com/nodejs/node/issues/61904); `pathLength`
+// scales the malformed path so a regression shows up as a sharp drop in ops/sec
+// rather than a hang.
+'use strict';
+
+const common = require('../common.js');
+
+const configs = {
+  n: [1e4],
+  pathLength: [1e2, 1e3, 1e4],
+};
+
+const options = {
+  flags: ['--expose-internals'],
+};
+
+const bench = common.createBenchmark(main, configs, options);
+
+function main({ n, pathLength }) {
+  const { defaultGetFormat } = require('internal/modules/esm/get_format');
+  const url = new URL(`data:a/${'a'.repeat(pathLength)}B`);
+
+  bench.start();
+  for (let i = 0; i < n; i++) {
+    defaultGetFormat(url, { parentURL: undefined });
+  }
+  bench.end(n);
+}
@@ -104,7 +104,7 @@ function detectModuleFormat(source, url) {
  */
 function getDataProtocolModuleFormat(parsed) {
   const { 1: mime } = RegExpPrototypeExec(
-    /^([^/]+\/[^;,]+)(?:[^,]*?)(;base64)?,/,
+    /^([^/]+\/[^;,]+)(?:;[^,]*)?,/,
     parsed.pathname,
   ) || [ null, null, null ];
 
 
@@ -201,7 +201,7 @@ function throwIfUnsupportedURLScheme(parsed) {
  */
 function throwUnknownModuleFormat(url, format) {
   const dataUrl = RegExpPrototypeExec(
-    /^data:([^/]+\/[^;,]+)(?:[^,]*?)(;base64)?,/,
+    /^data:([^/]+\/[^;,]+)(?:;[^,]*)?,/,
     url,
   );