Merge pull request #84 from nieldw/fix/very_large_text_block

Fix StackOverflowError in extra-long Text Block by using the possessive quantifier to avoid backtracking
qoomon · Dec 9, 2020 · 62ca00c · 62ca00c
2 parents 0f0b24f + a1ff9fa
commit 62ca00c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/main/java/com/qoomon/banking/swift/message/block/TextBlock.java b/src/main/java/com/qoomon/banking/swift/message/block/TextBlock.java
@@ -11,7 +11,7 @@ public class TextBlock implements SwiftBlock {
 
     public static final String BLOCK_ID_4 = "4";
 
-    public static final Pattern FIELD_PATTERN = Pattern.compile("([^\\n]+)?\\n((?>:?.*\\n)*-)");
+    public static final Pattern FIELD_PATTERN = Pattern.compile("([^\\n]+)?\\n((?>:?.*\\n)*+-)");
 
     private final Optional<String> infoLine;
 

diff --git a/src/test/java/com/qoomon/banking/swift/message/block/TextBlockTest.java b/src/test/java/com/qoomon/banking/swift/message/block/TextBlockTest.java
@@ -11,6 +11,21 @@
  */
 public class TextBlockTest {
 
+    @Test
+    public void of_WHEN_valid_block_with_info_line_is_passed_RETURN_new_block() throws Exception {
+
+        // Given
+        GeneralBlock generalBlock = new GeneralBlock(TextBlock.BLOCK_ID_4, "info\nabc\n-");
+
+        // When
+        TextBlock block = TextBlock.of(generalBlock);
+
+        // Then
+        assertThat(block).isNotNull();
+        assertThat(block.getInfoLine()).hasValue("info");
+        assertThat(block.getText()).isEqualTo("abc\n-");
+    }
+
     @Test
     public void of_WHEN_valid_block_is_passed_RETURN_new_block() throws Exception {