Fix #152 in 2.4

Author: cowtowncoder

release-notes/VERSION

@@ -1,15 +1,20 @@
 Project: jackson-core
-Version: 2.4.2 (13-Aug-2014)
+Version: 2.4.3 (xx-xxx-2014)
 
-#145: NPE at BytesToNameCanonicalizer
- (reported by Shay B)
-#146: Error while parsing negative floats at the end of the input buffer
- (reported by rjmac@github)
+#152: Exception for property names longer than 256k
+ (reported by CrendKing@github)
 
 ------------------------------------------------------------------------
 === History: ===
 ------------------------------------------------------------------------
 
+2.4.2 (13-Aug-2014)
+
+#145: NPE at BytesToNameCanonicalizer
+ (reported by Shay B)
+#146: Error while parsing negative floats at the end of the input buffer
+ (reported by rjmac@github)
+
 2.4.1 (16-Jun-2014)
 
 #143: Flaw in `BufferRecycler.allocByteBuffer(int,int)` that results in

src/main/java/com/fasterxml/jackson/core/util/TextBuffer.java

@@ -580,10 +580,13 @@ public char[] finishCurrentSegment() {
     public char[] expandCurrentSegment()
     {
         final char[] curr = _currentSegment;
-        // Let's grow by 50%
+        // Let's grow by 50% by default
         final int len = curr.length;
-        // Must grow by at least 1 char, no matter what
-        int newLen = (len == MAX_SEGMENT_LEN) ? (MAX_SEGMENT_LEN+1) : Math.min(MAX_SEGMENT_LEN, len + (len >> 1));
+        int newLen = len + (len >> 1);
+        // but above intended maximum, slow to increase by 25%
+        if (newLen > MAX_SEGMENT_LEN) {
+            newLen = len + (len >> 2);
+        }
         return (_currentSegment = Arrays.copyOf(curr, newLen));
     }
 

src/test/java/com/fasterxml/jackson/core/util/TestTextBuffer.java

@@ -62,4 +62,19 @@ public void testLongAppend()
          assertEquals(len+2, tb.size());
          assertEquals(EXP, tb.contentsAsString());
       }
+
+      // [Core#152]
+      public void testExpand()
+      {
+          TextBuffer tb = new TextBuffer(new BufferRecycler());
+          char[] buf = tb.getCurrentSegment();
+
+          while (buf.length < 500 * 1000) {
+              char[] old = buf;
+              buf = tb.expandCurrentSegment();
+              if (old.length >= buf.length) {
+                  fail("Expected buffer of "+old.length+" to expand, did not, length now "+buf.length);
+              }
+          }
+      }
 }