Fixed upperbound and lower bound of IntAccept#acceptInteger(long).

oza · oza · commit 907cfedb5726 · 2013-08-16T09:58:21.000+09:00
Signed-off-by: Tsuyoshi Ozawa &lt;ozawa.tsuyoshi@gmail.com&gt;
diff --git a/src/main/java/org/msgpack/unpacker/IntAccept.java b/src/main/java/org/msgpack/unpacker/IntAccept.java
@@ -43,7 +43,7 @@ void acceptInteger(int v) {
 
     @Override
     void acceptInteger(long v) {
-        if (value < (long) Integer.MIN_VALUE || value > (long) Integer.MAX_VALUE) {
+        if (v < (long) Integer.MIN_VALUE || v > (long) Integer.MAX_VALUE) {
             throw new MessageTypeException(); // TODO message
         }
         this.value = (int) v;
diff --git a/src/test/java/org/msgpack/TestPackUnpack.java b/src/test/java/org/msgpack/TestPackUnpack.java
@@ -119,6 +119,34 @@ public void testLong(long v) throws Exception {
 	assertEquals(bytes.length, unpacker.getReadByteCount());
     }
 
+    @Test(expected=MessageTypeException.class)
+    public void testReadIntOverUpperBound() throws Exception {
+        long v = Integer.MAX_VALUE + 1L;
+        MessagePack msgpack = new MessagePack();
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        Packer packer = msgpack.createPacker(out);
+        packer.write(v);
+        byte[] bytes = out.toByteArray();
+        ByteArrayInputStream in = new ByteArrayInputStream(bytes);
+        Unpacker unpacker = msgpack.createUnpacker(in);
+        unpacker.resetReadByteCount();
+        unpacker.readInt();
+    }
+
+    @Test(expected=MessageTypeException.class)
+    public void testReadIntUnderLowerBound() throws Exception {
+        long v = Integer.MIN_VALUE - 1L;
+        MessagePack msgpack = new MessagePack();
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        Packer packer = msgpack.createPacker(out);
+        packer.write(v);
+        byte[] bytes = out.toByteArray();
+        ByteArrayInputStream in = new ByteArrayInputStream(bytes);
+        Unpacker unpacker = msgpack.createUnpacker(in);
+        unpacker.resetReadByteCount();
+        unpacker.readInt();
+    }
+
     @Override
     public void testFloat(float v) throws Exception {
 	MessagePack msgpack = new MessagePack();

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ void acceptInteger(int v) {`
`43`	`43`
`44`	`44`	`@Override`
`45`	`45`	`void acceptInteger(long v) {`
`46`		`- if (value < (long) Integer.MIN_VALUE \|\| value > (long) Integer.MAX_VALUE) {`
	`46`	`+ if (v < (long) Integer.MIN_VALUE \|\| v > (long) Integer.MAX_VALUE) {`
`47`	`47`	`throw new MessageTypeException(); // TODO message`
`48`	`48`	`}`
`49`	`49`	`this.value = (int) v;`