Merge pull request msgpack#319 from msgpack/v07-fix-is-fixed-map

xerial · xerial · commit 6b04287e108e · 2016-01-04T11:13:17.000+09:00
v0.7: Fix MessagePack.Code#isFixedMap
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePack.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePack.java
@@ -234,7 +234,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,40 @@ class MessagePackTest extends MessagePackSpec {
       }
     }
 
+    "detect fixarray values" in {
+
+      val outputStream = new ByteArrayOutputStream
+      val packer = MessagePack.newDefaultPacker(outputStream)
+      packer.packArrayHeader(0)
+      packer.close
+      val bytes = outputStream.toByteArray
+      MessagePack.newDefaultUnpacker(bytes).unpackArrayHeader() shouldBe 0
+      try {
+        MessagePack.newDefaultUnpacker(bytes).unpackMapHeader()
+        fail("Shouldn't reach here")
+      }
+      catch {
+        case e: MessageTypeException => // OK
+      }
+    }
+
+    "detect fixmap values" in {
+
+      val outputStream = new ByteArrayOutputStream
+      val packer = MessagePack.newDefaultPacker(outputStream)
+      packer.packMapHeader(0)
+      packer.close
+      val bytes = outputStream.toByteArray
+      MessagePack.newDefaultUnpacker(bytes).unpackMapHeader() shouldBe 0
+      try {
+        MessagePack.newDefaultUnpacker(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
`@@ -234,7 +234,7 @@ public static final boolean isFixedArray(byte b)`
`234`	`234`
`235`	`235`	`public static final boolean isFixedMap(byte b)`
`236`	`236`	`{`
`237`		`- return (b & (byte) 0xe0) == Code.FIXMAP_PREFIX;`
	`237`	`+ return (b & (byte) 0xf0) == Code.FIXMAP_PREFIX;`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`public static final boolean isFixedRaw(byte b)`