fix a fuzzing issue

LLNL · Oct 24, 2023 · 40cf626 · 40cf626
1 parent 0387ff2
commit 40cf626
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/test/files/fuzz_issues/rtrip_fail36 b/test/files/fuzz_issues/rtrip_fail36
@@ -0,0 +1 @@
+rc-�+A+8_A+8US6�2+B .3 %sq.23s
diff --git a/test/fuzz_issue_tests.cpp b/test/fuzz_issue_tests.cpp
@@ -253,11 +253,11 @@ TEST_P(rtripProblems, rtripFiles)
     }
 }
 
-INSTANTIATE_TEST_SUITE_P(rtripFiles, rtripProblems, ::testing::Range(1, 36));
+INSTANTIATE_TEST_SUITE_P(rtripFiles, rtripProblems, ::testing::Range(1, 37));
 
 TEST(fuzzFailures, rtripSingleProblems)
 {
-    auto cdata = loadFailureFile("rtrip_fail", 35);
+    auto cdata = loadFailureFile("rtrip_fail", 36);
     auto u1 = unit_from_string(cdata);
     if (!is_error(u1)) {
         auto str = to_string(u1);

diff --git a/units/units.cpp b/units/units.cpp
@@ -5302,6 +5302,14 @@ static precise_unit
             unit_string[sep + 1] == '+') {
             return precise::invalid;
         }
+        if (unit_string[sep - 1] == 'e' || unit_string[sep - 1] == 'E')
+        {
+            //this is scientific notation not addition
+            if (isDigitCharacter(unit_string[sep + 1]) && (sep > 1 && isDigitCharacter(unit_string[sep - 2])))
+            {
+                return precise::invalid;
+            }
+        }
         precise_unit a_unit;
         precise_unit b_unit;
         if (sep + 1 > unit_string.size() / 2) {