Skip to content

fix: reject partial formatted number parses #1162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
delei merged 2 commits into from
Oct 8, 2026
Merged

fix: reject partial formatted number parses #1162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c0b43b
fix: reject partial formatted number parses (#1152)
Aias00 Sep 30, 2026
0b9696b
Merge branch 'main' into fix/numberformat-trailing-garbage-1152
delei Oct 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion fesod-sheet/src/main/java/org/apache/fesod/sheet/util/NumberUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.ParseException;
import java.text.ParsePosition;
import java.util.Locale;
import java.util.Map;
import org.apache.fesod.common.util.MapUtils;
Expand Down Expand Up @@ -228,7 +229,12 @@ private static Number parse(String string, ExcelContentProperty contentProperty)
RoundingMode roundingMode = contentProperty.getNumberFormatProperty().getRoundingMode();
DecimalFormat decimalFormat = getCacheDecimalFormat(format, roundingMode);
decimalFormat.setParseBigDecimal(true);
return decimalFormat.parse(string);
ParsePosition position = new ParsePosition(0);
Number number = decimalFormat.parse(string, position);
if (number == null || position.getIndex() != string.length()) {
throw new ParseException("Unparseable number: \"" + string + "\"", position.getIndex());
}
return number;
}

private static DecimalFormat getCacheDecimalFormat(String format, RoundingMode roundingMode) {
Expand Down
20 changes: 20 additions & 0 deletions fesod-sheet/src/test/java/org/apache/fesod/sheet/util/NumberUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,26 @@ void test_parseDouble_withFormat() throws ParseException {
Assertions.assertEquals(0.1234, result, 0.000001);
}

@Test
void test_parseDouble_withFormatRejectsTrailingText() {
Mockito.when(contentProperty.getNumberFormatProperty()).thenReturn(numberFormatProperty);
Mockito.when(numberFormatProperty.getFormat()).thenReturn("#,##0.00");
Mockito.when(numberFormatProperty.getRoundingMode()).thenReturn(RoundingMode.HALF_UP);

Assertions.assertThrows(ParseException.class, () -> NumberUtils.parseDouble("1,234.56abc", contentProperty));
}

@Test
void test_parseBigDecimal_withFormatAcceptsConfiguredSuffix() throws ParseException {
Mockito.when(contentProperty.getNumberFormatProperty()).thenReturn(numberFormatProperty);
Mockito.when(numberFormatProperty.getFormat()).thenReturn("#,##0.00kg");
Mockito.when(numberFormatProperty.getRoundingMode()).thenReturn(RoundingMode.HALF_UP);

BigDecimal result = NumberUtils.parseBigDecimal("1,234.56kg", contentProperty);

Assertions.assertEquals(0, new BigDecimal("1234.56").compareTo(result));
}

@Test
void test_parseLong_noFormat() throws ParseException {
Long result = NumberUtils.parseLong("123456789", null);
Expand Down
Loading