This is an automated email from the ASF dual-hosted git repository.
pjfanning pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/poi.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4a09f31c04 DataFormatter: avoid backtracking blowup in
rangeConditionalPattern (#1436)
4a09f31c04 is described below
commit 4a09f31c041bea8bc0533ea9a8a0ffa30b83c763
Author: Nayyar <[email protected]>
AuthorDate: Sun Oct 18 14:08:11 2026 +0530
DataFormatter: avoid backtracking blowup in rangeConditionalPattern (#1436)
The constant in rangeConditionalPattern, -?[0-9]*\.?[0-9]+, can split a
run of digits between the two quantifiers in every possible way, so an
unterminated condition such as "[<" followed by many digits backtracks
polynomially. The pattern is checked on every getFormat call, before the
format cache, so the cost is paid for every formatted cell.
-?(?:[0-9]*\.)?[0-9]+ matches the same strings with a single way to
match a digit run.
---
.../java/org/apache/poi/ss/usermodel/DataFormatter.java | 2 +-
.../org/apache/poi/ss/usermodel/TestDataFormatter.java | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/poi/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java
b/poi/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java
index 983ec2a955..ff62944d84 100644
--- a/poi/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java
+++ b/poi/src/main/java/org/apache/poi/ss/usermodel/DataFormatter.java
@@ -137,7 +137,7 @@ public class DataFormatter {
private static final Pattern dbNumPattern =
Pattern.compile("\\[DBNum[123]]", Pattern.CASE_INSENSITIVE);
/** Pattern to find formats with condition ranges e.g. [>=100] */
- private static final Pattern rangeConditionalPattern =
Pattern.compile("\\[\\s*(<>|<=|>=|<|>|=)\\s*-?[0-9]*\\.?[0-9]+\\s*]");
+ private static final Pattern rangeConditionalPattern =
Pattern.compile("\\[\\s*(<>|<=|>=|<|>|=)\\s*-?(?:[0-9]*\\.)?[0-9]+\\s*]");
/**
* A regex to find locale patterns like [$$-1009] and [$?-452], or a
currency string without a locale like [$USD].
diff --git
a/poi/src/test/java/org/apache/poi/ss/usermodel/TestDataFormatter.java
b/poi/src/test/java/org/apache/poi/ss/usermodel/TestDataFormatter.java
index 462d48f849..b96541e5c6 100644
--- a/poi/src/test/java/org/apache/poi/ss/usermodel/TestDataFormatter.java
+++ b/poi/src/test/java/org/apache/poi/ss/usermodel/TestDataFormatter.java
@@ -21,6 +21,7 @@ import static org.apache.poi.POITestCase.assertContains;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTimeoutPreemptively;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
@@ -28,6 +29,7 @@ import java.text.DateFormat;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.Format;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -261,6 +263,20 @@ class TestDataFormatter {
String format = "[>=10]#,##0;[<10]0.0";
assertEquals("17,876", dfUS.formatRawCellContents(17876.000, -1,
format), "Wrong format for " + format);
assertEquals("9.7", dfUS.formatRawCellContents(9.71, -1, format),
"Wrong format for " + format);
+
+ assertEquals("[1.2]", dfUS.formatRawCellContents(1.23, -1,
"[<1.5]\"[\"0.0\"]\""));
+ assertEquals("[0.6]", dfUS.formatRawCellContents(0.55, -1,
"[>=.5]\"[\"0.0\"]\""));
+ }
+
+ @Test
+ void testConditionalRangeWithLongNumber() {
+ DataFormatter dfUS = new DataFormatter(Locale.US);
+
+ // an unterminated condition with many digits used to backtrack
polynomially in rangeConditionalPattern
+ String format = "[<" + "1".repeat(50_000);
+ String result = assertTimeoutPreemptively(Duration.ofSeconds(10),
+ () -> dfUS.formatRawCellContents(1.5, -1, format));
+ assertEquals("1.5", result);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]