Fix multi bytes decoding error at boundary

miniway · miniway · commit bd1d3e6dfd7b · 2014-10-24T17:18:40.000-07: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
@@ -25,6 +25,7 @@
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CoderResult;
 import java.nio.charset.CodingErrorAction;
+import java.nio.charset.MalformedInputException;
 
 import org.msgpack.core.MessagePack.Code;
 import org.msgpack.core.buffer.MessageBuffer;
@@ -968,7 +969,7 @@ public String unpackString() throws IOException {
                 decodeBuffer.clear();
                 StringBuilder sb = new StringBuilder();
                 while(cursor < strLen) {
-                    if(!ensureBuffer())
+                    if (!ensure(strLen))
                         throw new EOFException();
 
                     int readLen = Math.min(buffer.size() - position, strLen-cursor);
@@ -987,6 +988,16 @@ public String unpackString() throws IOException {
                             decoder.reset();
                         }
 
+                        if(cr.isUnderflow() && bb.hasRemaining()) {
+                            // input buffer doesn't have enough bytes for multi bytes characters
+                            if(config.getActionOnMalFormedInput() == CodingErrorAction.REPORT) {
+                                throw new MalformedInputException(strLen);
+                            }
+                            // trash truncated bytes
+                            while (bb.hasRemaining())
+                                bb.get();
+                        }
+
                         if(cr.isError()) {
                             if((cr.isMalformed() && config.getActionOnMalFormedInput() == CodingErrorAction.REPORT) ||
                                (cr.isUnmappable() && config.getActionOnUnmappableCharacter() == CodingErrorAction.REPORT)) {
