From 060b01b5eee808cd489db520a24466b5fbbe08e3 Mon Sep 17 00:00:00 2001
From: chegar <none@none>
Date: Mon, 15 Feb 2016 14:25:21 +0000
Subject: [PATCH] 8134424: BlockDataInputStream.readUTFBody: size local
 StringBuffer with the given length Reviewed-by: rriggs, shade

---
 src/share/classes/java/io/ObjectInputStream.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/share/classes/java/io/ObjectInputStream.java b/src/share/classes/java/io/ObjectInputStream.java
index 9d293c707..cb84d0137 100644
--- a/src/share/classes/java/io/ObjectInputStream.java
+++ b/src/share/classes/java/io/ObjectInputStream.java
@@ -3403,7 +3403,15 @@ public class ObjectInputStream
          * utflen bytes.
          */
         private String readUTFBody(long utflen) throws IOException {
-            StringBuilder sbuf = new StringBuilder();
+            StringBuilder sbuf;
+            if (utflen > 0 && utflen < Integer.MAX_VALUE) {
+                // a reasonable initial capacity based on the UTF length
+                int initialCapacity = Math.min((int)utflen, 0xFFFF);
+                sbuf = new StringBuilder(initialCapacity);
+            } else {
+                sbuf = new StringBuilder();
+            }
+
             if (!blkmode) {
                 end = pos = 0;
             }
-- 
GitLab