fixed MessageUnpacker.utf8MultibyteCharacterSize

frsyuki · komamitsu · commit ccac8a76f5ba · 2015-12-27T17:48:21.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
@@ -17,7 +17,6 @@
 
 import org.msgpack.core.MessagePack.Code;
 import org.msgpack.core.buffer.MessageBuffer;
-import org.msgpack.core.buffer.MessageBufferReader;
 import org.msgpack.core.buffer.MessageBufferInput;
 import org.msgpack.value.ImmutableValue;
 import org.msgpack.value.Value;
@@ -186,7 +185,7 @@ private byte getHeadByte()
         if (b == HEAD_BYTE_REQUIRED) {
             b = headByte = readByte();
             if (b == HEAD_BYTE_REQUIRED) {
-                throw new MessageNeverUsedFormatException("Encountered 0xC1 NEVER_USED byte");
+                throw new MessageNeverUsedFormatException("Encountered 0xC1 \"NEVER_USED\" byte");
             }
         }
         return b;
@@ -205,7 +204,9 @@ private void nextBuffer()
             throw new MessageInsufficientBufferException();
         }
         totalReadBytes += buffer.size();
-        in.release(buffer);
+        if (buffer != EMPTY_BUFFER) {
+            in.release(buffer);
+        }
         buffer = next;
         position = 0;
     }
@@ -232,7 +233,9 @@ private MessageBuffer readCastBuffer(int length)
             castBuffer.putBytes(remaining, next.getArray(), next.offset(), length - remaining);
 
             totalReadBytes += buffer.size();
-            in.release(buffer);
+            if (buffer != EMPTY_BUFFER) {
+                in.release(buffer);
+            }
 
             buffer = next;
             position = length - remaining;
@@ -244,8 +247,7 @@ private MessageBuffer readCastBuffer(int length)
 
     private static int utf8MultibyteCharacterSize(byte firstByte)
     {
-        System.out.println("first byte: "+(firstByte & 0xff));
-        return Integer.numberOfLeadingZeros(~(firstByte & 0xff));
+        return Integer.numberOfLeadingZeros(~(firstByte & 0xff) << 24);
     }
 
     /**
@@ -264,7 +266,9 @@ public boolean hasNext()
                 return false;
             }
             totalReadBytes += buffer.size();
-            in.release(buffer);
+            if (buffer != EMPTY_BUFFER) {
+                in.release(buffer);
+            }
             buffer = next;
             position = 0;
         }
@@ -490,7 +494,7 @@ public ImmutableValue unpackValue()
         MessageFormat mf = getNextFormat();
         switch (mf.getValueType()) {
             case NIL:
-                unpackNil();
+                readByte();
                 return ValueFactory.newNil();
             case BOOLEAN:
                 return ValueFactory.newBoolean(unpackBoolean());
@@ -1070,7 +1074,7 @@ else if (bufferRemaining == 0) {
                         if (cr.isError()) {
                             handleCoderError(cr);
                         }
-                        if (cr.isUnderflow() || cr.isOverflow()) {
+                        if (cr.isOverflow() || (cr.isUnderflow() && multiByteBuffer.position() < multiByteBuffer.limit())) {
                             // isOverflow or isOverflow must not happen. if happened, throw exception
                             try {
                                 cr.throwException();
@@ -1106,7 +1110,7 @@ private String decodeStringFastPath(int length)
         if (config.actionOnMalFormedInput == CodingErrorAction.REPLACE &&
                 config.actionOnUnmappableCharacter == CodingErrorAction.REPLACE &&
                 buffer.hasArray()) {
-            String s = new String(buffer.getArray(), position, length, MessagePack.UTF8);
+            String s = new String(buffer.getArray(), buffer.offset() + position, length, MessagePack.UTF8);
             position += length;
             return s;
         }
@@ -1425,6 +1429,11 @@ private int readNextLength32()
     public void close()
             throws IOException
     {
+        if (buffer != EMPTY_BUFFER) {
+            in.release(buffer);
+            buffer = EMPTY_BUFFER;
+            position = 0;
+        }
         in.close();
     }
 
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBuffer.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBuffer.java
@@ -328,11 +328,6 @@ else if (bb.hasArray()) {
         this.reference = reference;
     }
 
-    public MessageBufferReader newReader()
-    {
-        return new MessageBufferReader(this);
-    }
-
     /**
      * byte size of the buffer
      *
@@ -408,7 +403,7 @@ public void getBytes(int index, byte[] dst, int dstOffset, int length)
 
     public void getBytes(int index, int len, ByteBuffer dst)
     {
-        if (dst.remaining() > len) {
+        if (dst.remaining() < len) {
             throw new BufferOverflowException();
         }
         ByteBuffer src = toByteBuffer(index, len);
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferReader.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferReader.java

Original file line number	Diff line number	Diff line change
`@@ -328,11 +328,6 @@ else if (bb.hasArray()) {`
`328`	`328`	`this.reference = reference;`
`329`	`329`	`}`
`330`	`330`
`331`		`- public MessageBufferReader newReader()`
`332`		`- {`
`333`		`- return new MessageBufferReader(this);`
`334`		`- }`
`335`		`-`
`336`	`331`	`/**`
`337`	`332`	`* byte size of the buffer`
`338`	`333`	`*`
`@@ -408,7 +403,7 @@ public void getBytes(int index, byte[] dst, int dstOffset, int length)`
`408`	`403`
`409`	`404`	`public void getBytes(int index, int len, ByteBuffer dst)`
`410`	`405`	`{`
`411`		`- if (dst.remaining() > len) {`
	`406`	`+ if (dst.remaining() < len) {`
`412`	`407`	`throw new BufferOverflowException();`
`413`	`408`	`}`
`414`	`409`	`ByteBuffer src = toByteBuffer(index, len);`