Merge pull request #251 from LeszekSwirski/json-empty-exponent

lemire · web-flow · commit 9468d50c899d · 2024-07-22T09:07:08.000-04:00
Disallow empty exponent in JSON parsing
diff --git a/include/fast_float/ascii_number.h b/include/fast_float/ascii_number.h
@@ -349,7 +349,7 @@ parsed_number_string_t<UC> parse_number_string(UC const *p, UC const * pend, par
       ++p;
     }
     if ((p == pend) || !is_integer(*p)) {
-      if(!(fmt & chars_format::fixed)) {
+      if(!(fmt & chars_format::fixed) || (fmt & FASTFLOAT_JSONFMT)) {
         // We are in error.
         return answer;
       }
diff --git a/tests/json_fmt.cpp b/tests/json_fmt.cpp
@@ -40,7 +40,9 @@ int main()
 {
   const std::vector<double> expected{ -0.2, 0.02, 0.002, 1., 0., std::numeric_limits<double>::infinity() };
   const std::vector<std::string> accept{ "-0.2", "0.02", "0.002", "1e+0000", "0e-2", "inf" };
-  const std::vector<std::string> reject{ "-.2", "00.02", "0.e+1", "00.e+1", ".25", "+0.25", "inf", "nan(snan)" };
+  const std::vector<std::string> reject{"-.2", "00.02",    "0.e+1", "00.e+1",
+                                        "1e",  "1e+",      ".25",   "+0.25",
+                                        "inf", "nan(snan)"};
 
   for (std::size_t i = 0; i < accept.size(); ++i)
   {

Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ parsed_number_string_t<UC> parse_number_string(UC const p, UC const pend, par`
`349`	`349`	`++p;`
`350`	`350`	`}`
`351`	`351`	`if ((p == pend) \|\| !is_integer(*p)) {`
`352`		`- if(!(fmt & chars_format::fixed)) {`
	`352`	`+ if(!(fmt & chars_format::fixed) \|\| (fmt & FASTFLOAT_JSONFMT)) {`
`353`	`353`	`// We are in error.`
`354`	`354`	`return answer;`
`355`	`355`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,9 @@ int main()`
`40`	`40`	`{`
`41`	`41`	`const std::vector<double> expected{ -0.2, 0.02, 0.002, 1., 0., std::numeric_limits<double>::infinity() };`
`42`	`42`	`const std::vector<std::string> accept{ "-0.2", "0.02", "0.002", "1e+0000", "0e-2", "inf" };`
`43`		`- const std::vector<std::string> reject{ "-.2", "00.02", "0.e+1", "00.e+1", ".25", "+0.25", "inf", "nan(snan)" };`
	`43`	`+ const std::vector<std::string> reject{"-.2", "00.02", "0.e+1", "00.e+1",`
	`44`	`+ "1e", "1e+", ".25", "+0.25",`
	`45`	`+ "inf", "nan(snan)"};`
`44`	`46`
`45`	`47`	`for (std::size_t i = 0; i < accept.size(); ++i)`
`46`	`48`	`{`