Fixed #248. There was a bug in the buffer resizing code.

EsotericSoftware · Sep 29, 2014 · 23830f6 · 23830f6
1 parent a306471
commit 23830f6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/com/esotericsoftware/kryo/io/ByteBufferOutput.java b/src/com/esotericsoftware/kryo/io/ByteBufferOutput.java
@@ -160,7 +160,6 @@ public ByteBuffer getByteBuffer () {
  /** Returns a new byte array containing the bytes currently in the buffer between zero and {@link #position()}. */
  public byte[] toBytes () {
  byte[] newBuffer = new byte[position];
- niobuffer.position(position);
  niobuffer.position(0);
  niobuffer.get(newBuffer, 0, position);
  return newBuffer;
@@ -195,8 +194,9 @@ protected boolean require (int required) throws KryoException {
  .allocateDirect(capacity);
  // Copy the whole buffer
  niobuffer.position(0);
+ niobuffer.limit(position);
  newBuffer.put(niobuffer);
- newBuffer.order(byteOrder);
+ newBuffer.order(niobuffer.order());
  niobuffer = newBuffer;
  }
  return true;

diff --git a/test/com/esotericsoftware/kryo/InputOutputTest.java b/test/com/esotericsoftware/kryo/InputOutputTest.java
@@ -785,6 +785,21 @@ public void testSmallBuffers () throws Exception {
 
  input.readBytes(toRead);
  }
+
+ public void testVerySmallBuffers() throws Exception {
+ Output out1 = new Output(4, -1);
+ Output out2 = new ByteBufferOutput(4, -1);
+
+ for (int i = 0; i < 16; i++) {
+ out1.writeVarInt(92, false);
+ }
+
+ for (int i = 0; i < 16; i++) {
+ out2.writeVarInt(92, false);
+ }
+
+ assertEquals(out1.toBytes(), out2.toBytes());
+ }
 
  public void testZeroLengthOutputs() throws Exception {
  Output output = new Output(0, 10000);