refined AbstractUnpacker and MessagePackUnpacker classes again

muga · muga · commit 1cf85a3bf165 · 2011-11-04T03:21:07.000+09:00
diff --git a/src/main/java/org/msgpack/unpacker/AbstractUnpacker.java b/src/main/java/org/msgpack/unpacker/AbstractUnpacker.java
@@ -117,22 +117,24 @@ public void resetReadByteCount() {
     }
 
     public void setRawSizeLimit(long size) {
-        if (size > 0 && size >= 67108864) {
+        if (size < 32) {
+            rawSizeLimit = 32;
+        } else {
             rawSizeLimit = size;
         }
     }
 
     public void setArraySizeLimit(int size) {
-        if(size < 0 || size >= 4096) {
-            arraySizeLimit = 4096;
+        if (size < 16) {
+            arraySizeLimit = 16;
         } else {
             arraySizeLimit = size;
         }
     }
 
     public void setMapSizeLimit(int size) {
-        if(size < 0 || size >= 4096) {
-            mapSizeLimit = 4096;
+        if (size < 16) {
+            mapSizeLimit = 16;
         } else {
             mapSizeLimit = size;
         }
diff --git a/src/main/java/org/msgpack/unpacker/MessagePackUnpacker.java b/src/main/java/org/msgpack/unpacker/MessagePackUnpacker.java
@@ -212,6 +212,11 @@ private boolean readOneWithoutStackLarge(Accept a, final int b) throws IOExcepti
                     headByte = REQUIRE_TO_READ_HEAD;
                     return true;
                 }
+                if (count >= rawSizeLimit) {
+                    String reason = String.format("Size of raw (%d) over limit at %d",
+                            new Object[] { count, rawSizeLimit });
+                    throw new SizeLimitException(reason);
+                }
                 in.advance();
                 if (!tryReferRawBody(a, count)) {
                     readRawBody(count);
@@ -224,17 +229,17 @@ private boolean readOneWithoutStackLarge(Accept a, final int b) throws IOExcepti
         case 0xdb:  // raw 32
             {
                 int count = in.getInt();
-                if (count < 0 || count > rawSizeLimit) {
-                    String reason = String.format("Size of raw (%d) over limit at %d",
-                            new Object[] { count, rawSizeLimit });
-                    throw new SizeLimitException(reason);
-                }
                 if (count == 0) {
                     a.acceptEmptyRaw();
                     in.advance();
                     headByte = REQUIRE_TO_READ_HEAD;
                     return true;
                 }
+                if (count < 0 || count >= rawSizeLimit) {
+                    String reason = String.format("Size of raw (%d) over limit at %d",
+                            new Object[] { count, rawSizeLimit });
+                    throw new SizeLimitException(reason);
+                }
                 in.advance();
                 if (!tryReferRawBody(a, count)) {
                     readRawBody(count);
@@ -247,7 +252,7 @@ private boolean readOneWithoutStackLarge(Accept a, final int b) throws IOExcepti
         case 0xdc:  // array 16
             {
                 int count = in.getShort() & 0xffff;
-                if (count > arraySizeLimit) {
+                if (count >= arraySizeLimit) {
                     String reason = String.format("Size of array (%d) over limit at %d",
                             new Object[] { count, arraySizeLimit });
                     throw new SizeLimitException(reason);
@@ -262,7 +267,7 @@ private boolean readOneWithoutStackLarge(Accept a, final int b) throws IOExcepti
         case 0xdd:  // array 32
             {
                 int count = in.getInt();
-                if (count < 0 || count > arraySizeLimit) {
+                if (count < 0 || count >= arraySizeLimit) {
                     String reason = String.format("Size of array (%d) over limit at %d",
                             new Object[] { count, arraySizeLimit });
                     throw new SizeLimitException(reason);
@@ -277,7 +282,7 @@ private boolean readOneWithoutStackLarge(Accept a, final int b) throws IOExcepti
         case 0xde:  // map 16
             {
                 int count = in.getShort() & 0xffff;
-                if (count > mapSizeLimit) {
+                if (count >= mapSizeLimit) {
                     String reason = String.format("Size of map (%d) over limit at %d",
                             new Object[] { count, mapSizeLimit });
                     throw new SizeLimitException(reason);
@@ -292,7 +297,7 @@ private boolean readOneWithoutStackLarge(Accept a, final int b) throws IOExcepti
         case 0xdf:  // map 32
             {
                 int count = in.getInt();
-                if (count < 0 || count > mapSizeLimit) {
+                if (count < 0 || count >= mapSizeLimit) {
                     String reason = String.format("Size of map (%d) over limit at %d",
                             new Object[] { count, mapSizeLimit });
                     throw new SizeLimitException(reason);

Original file line number	Diff line number	Diff line change
`@@ -117,22 +117,24 @@ public void resetReadByteCount() {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`public void setRawSizeLimit(long size) {`
`120`		`- if (size > 0 && size >= 67108864) {`
	`120`	`+ if (size < 32) {`
	`121`	`+ rawSizeLimit = 32;`
	`122`	`+ } else {`
`121`	`123`	`rawSizeLimit = size;`
`122`	`124`	`}`
`123`	`125`	`}`
`124`	`126`
`125`	`127`	`public void setArraySizeLimit(int size) {`
`126`		`- if(size < 0 \|\| size >= 4096) {`
`127`		`- arraySizeLimit = 4096;`
	`128`	`+ if (size < 16) {`
	`129`	`+ arraySizeLimit = 16;`
`128`	`130`	`} else {`
`129`	`131`	`arraySizeLimit = size;`
`130`	`132`	`}`
`131`	`133`	`}`
`132`	`134`
`133`	`135`	`public void setMapSizeLimit(int size) {`
`134`		`- if(size < 0 \|\| size >= 4096) {`
`135`		`- mapSizeLimit = 4096;`
	`136`	`+ if (size < 16) {`
	`137`	`+ mapSizeLimit = 16;`
`136`	`138`	`} else {`
`137`	`139`	`mapSizeLimit = size;`
`138`	`140`	`}`