- fix ReDoS vulnerability (RegEx adopted from d3-color, see: d3/d3-c…

…olor#97)
loadingio · Oct 5, 2022 · d033b56 · d033b56
1 parent 2467f0f
commit d033b56
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -1,8 +1,8 @@
 (function(){
   var ReI, ReN, ReP, re, parse, ldcolor, t0, t1, t2, t3, Xn, Yn, Zn, conv, utils, k, v;
   ReI = "\\s*([+-]?\\d+|nan|NaN)\\s*";
-  ReN = "\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?|nan|NaN)\\s*";
-  ReP = "\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)%\\s*";
+  ReN = "\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?|nan|NaN)\\s*";
+  ReP = "\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)%\\s*";
   re = {
     hex3: /^#([0-9a-fA-F]{3})$/,
     hex6: /^#([0-9a-fA-F]{6})$/,

diff --git a/dist/index.min.js b/dist/index.min.js
diff --git a/dist/index.named.js b/dist/index.named.js
@@ -151,8 +151,8 @@
     yellowgreen: 0x9acd32
   };
   ReI = "\\s*([+-]?\\d+|nan|NaN)\\s*";
-  ReN = "\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?|nan|NaN)\\s*";
-  ReP = "\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)%\\s*";
+  ReN = "\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?|nan|NaN)\\s*";
+  ReP = "\\s*([+-]?(?:\\d*\\.)?\\d+(?:[eE][+-]?\\d+)?)%\\s*";
   re = {
     hex3: /^#([0-9a-fA-F]{3})$/,
     hex6: /^#([0-9a-fA-F]{6})$/,