msgpack#100: Add test cases for FIXEXT. Fix unmappable UTF8 character check

Author: xerial

msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java

@@ -342,9 +342,8 @@ public MessagePacker packString(String s) throws IOException {
                         }
 
                         if(cr.isError()) {
-                            if(cr.isMalformed() && config.getActionOnMalFormedInput() == CodingErrorAction.REPORT) {
-                                cr.throwException();
-                            } else if(cr.isUnderflow() && config.getActionOnUnmappableCharacter() == CodingErrorAction.REPORT) {
+                            if((cr.isMalformed() && config.getActionOnMalFormedInput() == CodingErrorAction.REPORT) ||
+                               (cr.isUnmappable() && config.getActionOnUnmappableCharacter() == CodingErrorAction.REPORT)) {
                                 cr.throwException();
                             }
                         }

msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java

@@ -831,9 +831,8 @@ public String unpackString() throws IOException {
                         }
 
                         if(cr.isError()) {
-                            if(cr.isMalformed() && config.getActionOnMalFormedInput() == CodingErrorAction.REPORT) {
-                                cr.throwException();
-                            } else if(cr.isUnmappable() && config.getActionOnUnmappableCharacter() == CodingErrorAction.REPORT) {
+                            if((cr.isMalformed() && config.getActionOnMalFormedInput() == CodingErrorAction.REPORT) ||
+                               (cr.isUnmappable() && config.getActionOnUnmappableCharacter() == CodingErrorAction.REPORT)) {
                                 cr.throwException();
                             }
                         }

msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala

@@ -32,7 +32,7 @@ class MessagePackTest extends MessagePackSpec  {
 
     "detect fixint quickly" in {
 
-      val N = 10000000
+      val N = 100000
       val idx = (0 until N).map(x => Random.nextInt(256).toByte).toArray[Byte]
 
       time("check fixint", repeat = 100) {
@@ -253,6 +253,13 @@ class MessagePackTest extends MessagePackSpec  {
           check(ext, _.packExtendedTypeHeader(ext.getType, ext.getLength), _.unpackExtendedTypeHeader())
         }
       }
+
+      val extLen = Seq(1, 2, 4, 8, 16, 1000, 2000, 10000, 50000, 100000, 500000)
+      for(l <- extLen) {
+        val ext = new ExtendedTypeHeader(l, Random.nextInt(128))
+        check(ext, _.packExtendedTypeHeader(ext.getType, ext.getLength), _.unpackExtendedTypeHeader())
+      }
+
     }
 
   }