generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-15 07:14:48 +02:00
Code Issues Projects Releases Wiki Activity

java: fixed problem that empty array and empty map don't check Schema

Browse Source
This commit is contained in:
frsyuki
2010-05-23 01:38:01 +09:00
parent 5982970e21
commit fa6ea6848f
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/src/main/java/org/msgpack/UnpackerImpl.java
View File

@@ -348,7 +348,10 @@ public class UnpackerImpl {
castBuffer.put(src, n, 2); castBuffer.put(src, n, 2);
count = ((int)castBuffer.getShort(0)) & 0xffff; count = ((int)castBuffer.getShort(0)) & 0xffff;
obj = new Object[count]; obj = new Object[count];
if(count == 0) { break _push; } // FIXME check IArraySchema if(count == 0) {
obj = ((IArraySchema)top_schema).createFromArray((Object[])obj);
break _push;
}
++top; ++top;
stack_obj[top] = top_obj; stack_obj[top] = top_obj;
stack_ct[top] = top_ct; stack_ct[top] = top_ct;
@@ -371,7 +374,10 @@ public class UnpackerImpl {
// FIXME overflow check // FIXME overflow check
count = castBuffer.getInt(0) & 0x7fffffff; count = castBuffer.getInt(0) & 0x7fffffff;
obj = new Object[count]; obj = new Object[count];
if(count == 0) { break _push; } // FIXME check IArraySchema if(count == 0) {
obj = ((IArraySchema)top_schema).createFromArray((Object[])obj);
break _push;
}
++top; ++top;
stack_obj[top] = top_obj; stack_obj[top] = top_obj;
stack_ct[top] = top_ct; stack_ct[top] = top_ct;
@@ -393,7 +399,10 @@ public class UnpackerImpl {
castBuffer.put(src, n, 2); castBuffer.put(src, n, 2);
count = ((int)castBuffer.getShort(0)) & 0xffff; count = ((int)castBuffer.getShort(0)) & 0xffff;
obj = new Object[count*2]; obj = new Object[count*2];
if(count == 0) { break _push; } // FIXME check IMapSchema if(count == 0) {
obj = ((IMapSchema)top_schema).createFromMap((Object[])obj);
break _push;
}
//System.out.println("fixmap count:"+count); //System.out.println("fixmap count:"+count);
++top; ++top;
stack_obj[top] = top_obj; stack_obj[top] = top_obj;
@@ -417,7 +426,10 @@ public class UnpackerImpl {
// FIXME overflow check // FIXME overflow check
count = castBuffer.getInt(0) & 0x7fffffff; count = castBuffer.getInt(0) & 0x7fffffff;
obj = new Object[count*2]; obj = new Object[count*2];
if(count == 0) { break _push; } // FIXME check IMapSchema if(count == 0) {
obj = ((IMapSchema)top_schema).createFromMap((Object[])obj);
break _push;
}
//System.out.println("fixmap count:"+count); //System.out.println("fixmap count:"+count);
++top; ++top;
stack_obj[top] = top_obj; stack_obj[top] = top_obj;