Avoid allocating too large bufffer when unpacking string

xerial · xerial · commit a4c95930be45 · 2015-04-09T18:58:11.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java
@@ -964,11 +964,12 @@ public String unpackString() throws IOException {
                 int cursor = 0;
                 decodeBuffer.clear();
                 StringBuilder sb = new StringBuilder();
+
                 while(cursor < strLen) {
-                    if (!ensure(strLen-cursor))
+                    int readLen = Math.min(position < buffer.size() ? buffer.size() - position : buffer.size(), strLen-cursor);
+                    if (!ensure(readLen))
                         throw new EOFException();
 
-                    int readLen = Math.min(buffer.size() - position, strLen-cursor);
                     ByteBuffer bb = buffer.toByteBuffer(position, readLen);
 
                     while(bb.hasRemaining()) {
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala
@@ -619,7 +619,7 @@ class MessageUnpackerTest extends MessagePackSpec {
       u.close
     }
 
-    "parse message large packed data" taggedAs("unpack") in {
+    "unpack large string data" taggedAs("large-string") in {
       def createLargeData(stringLength: Int): Array[Byte] = {
         val out = new ByteArrayOutputStream()
         val packer = msgpack.newPacker(out)

Original file line number	Diff line number	Diff line change
`@@ -619,7 +619,7 @@ class MessageUnpackerTest extends MessagePackSpec {`
`619`	`619`	`u.close`
`620`	`620`	`}`
`621`	`621`
`622`		`- "parse message large packed data" taggedAs("unpack") in {`
	`622`	`+ "unpack large string data" taggedAs("large-string") in {`
`623`	`623`	`def createLargeData(stringLength: Int): Array[Byte] = {`
`624`	`624`	`val out = new ByteArrayOutputStream()`
`625`	`625`	`val packer = msgpack.newPacker(out)`