Fix MessageFormat.Code#isFixedMap

komamitsu · komamitsu · commit d6dbfec7ef64 · 2015-12-27T21:36:24.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessageFormat.java b/msgpack-core/src/main/java/org/msgpack/core/MessageFormat.java
@@ -98,7 +98,7 @@ public static final boolean isFixedArray(byte b)
 
         public static final boolean isFixedMap(byte b)
         {
-            return (b & (byte) 0xe0) == Code.FIXMAP_PREFIX;
+            return (b & (byte) 0xf0) == Code.FIXMAP_PREFIX;
         }
 
         public static final boolean isFixedRaw(byte b)
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessagePackTest.scala
@@ -59,6 +59,38 @@ class MessagePackTest extends MessagePackSpec {
       }
     }
 
+    "detect fixarray values" in {
+
+      val packer = new MessagePackFactory().newBufferPacker()
+      packer.packArrayHeader(0)
+      packer.close
+      val bytes = packer.toByteArray
+      new MessagePackFactory().newUnpacker(bytes).unpackArrayHeader() shouldBe 0
+      try {
+        new MessagePackFactory().newUnpacker(bytes).unpackMapHeader()
+        fail("Shouldn't reach here")
+      }
+      catch {
+        case e: MessageTypeException => // OK
+      }
+    }
+
+    "detect fixmap values" in {
+
+      val packer = new MessagePackFactory().newBufferPacker()
+      packer.packMapHeader(0)
+      packer.close
+      val bytes = packer.toByteArray
+      new MessagePackFactory().newUnpacker(bytes).unpackMapHeader() shouldBe 0
+      try {
+        new MessagePackFactory().newUnpacker(bytes).unpackArrayHeader()
+        fail("Shouldn't reach here")
+      }
+      catch {
+        case e: MessageTypeException => // OK
+      }
+    }
+
     "detect fixint quickly" in {
 
       val N = 100000

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public static final boolean isFixedArray(byte b)`
`98`	`98`
`99`	`99`	`public static final boolean isFixedMap(byte b)`
`100`	`100`	`{`
`101`		`- return (b & (byte) 0xe0) == Code.FIXMAP_PREFIX;`
	`101`	`+ return (b & (byte) 0xf0) == Code.FIXMAP_PREFIX;`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`public static final boolean isFixedRaw(byte b)`