Fix MessageUnpacker#unpackString in case that string length is more than 8192

komamitsu · komamitsu · commit 25fc565ba1c2 · 2015-04-04T23:47:47.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
@@ -980,7 +980,6 @@ public String unpackString() throws IOException {
 
                         if(cr.isOverflow()) {
                             // The output CharBuffer has insufficient space
-                            readLen = bb.limit() - bb.remaining();
                             decoder.reset();
                         }
 
@@ -1005,9 +1004,10 @@ public String unpackString() throws IOException {
                         sb.append(decodeBuffer);
 
                         decodeBuffer.clear();
-                        cursor += readLen;
-                        consume(readLen);
                     }
+
+                    cursor += readLen;
+                    consume(readLen);
                 }
 
                 return sb.toString();
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala
@@ -618,5 +618,33 @@ class MessageUnpackerTest extends MessagePackSpec {
       checkFile(u)
       u.close
     }
+
+    "parse message large packed data" taggedAs("unpack") in {
+      def createLargeData(stringLength: Int): Array[Byte] = {
+        val out = new ByteArrayOutputStream()
+        val packer = msgpack.newPacker(out)
+
+        packer
+          .packArrayHeader(2)
+          .packString("l" * stringLength)
+          .packInt(1)
+
+        packer.close()
+
+        out.toByteArray
+      }
+
+      Seq(8191, 8192, 8193, 16383, 16384, 16385).foreach { n =>
+        val arr = createLargeData(n)
+
+        val unpacker = msgpack.newUnpacker(arr)
+
+        unpacker.unpackArrayHeader shouldBe 2
+        unpacker.unpackString.length shouldBe n
+        unpacker.unpackInt shouldBe 1
+
+        unpacker.getTotalReadBytes shouldBe arr.length
+      }
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -980,7 +980,6 @@ public String unpackString() throws IOException {`
`980`	`980`
`981`	`981`	`if(cr.isOverflow()) {`
`982`	`982`	`// The output CharBuffer has insufficient space`
`983`		`- readLen = bb.limit() - bb.remaining();`
`984`	`983`	`decoder.reset();`
`985`	`984`	`}`
`986`	`985`
`@@ -1005,9 +1004,10 @@ public String unpackString() throws IOException {`
`1005`	`1004`	`sb.append(decodeBuffer);`
`1006`	`1005`
`1007`	`1006`	`decodeBuffer.clear();`
`1008`		`- cursor += readLen;`
`1009`		`- consume(readLen);`
`1010`	`1007`	`}`
	`1008`	`+`
	`1009`	`+ cursor += readLen;`
	`1010`	`+ consume(readLen);`
`1011`	`1011`	`}`
`1012`	`1012`
`1013`	`1013`	`return sb.toString();`