Fixed #639

FasterXML · Sep 5, 2020 · 5bad0d4 · 5bad0d4
1 parent f20d936
commit 5bad0d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -24,6 +24,7 @@ JSON library.
 #630: Add `StreamWriteCapability` for further format-based/format-agnostic
   handling improvements
 #631: Add `JsonParser.getNumberValueExact()` to allow precision-retaining buffering
+#639: Limit initial allocated block size by `ByteArrayBuilder` to max block size
 - Deprecate `JsonParser.getCurrentTokenId()` (use `#currentTokenId()` instead)
 
 2.11.2 (02-Aug-2020)

diff --git a/src/main/java/com/fasterxml/jackson/core/util/ByteArrayBuilder.java b/src/main/java/com/fasterxml/jackson/core/util/ByteArrayBuilder.java
@@ -54,6 +54,11 @@ public final class ByteArrayBuilder extends OutputStream
 
     public ByteArrayBuilder(BufferRecycler br, int firstBlockSize) {
         _bufferRecycler = br;
+        // 04-Sep-2020, tatu: Let's make this bit more robust and refuse to allocate
+        //    humongous blocks even if requested
+        if (firstBlockSize > MAX_BLOCK_SIZE) {
+            firstBlockSize = MAX_BLOCK_SIZE;
+        }
         _currBlock = (br == null) ? new byte[firstBlockSize] : br.allocByteBuffer(BufferRecycler.BYTE_WRITE_CONCAT_BUFFER);
     }