serverscanning/capnproto-java-rpc
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update ByteBuffer.position() one last time before returning from Serialize.read().

Browse source
This commit is contained in:
David Renshaw 2015-08-17 22:13:06 -04:00
parent 755844c81a
commit 2127084a53
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compiler/src/test/schema/test.capnp
View file

@ -462,4 +462,4 @@ struct TestConstants {
} }
const globalInt :UInt32 = 12345; const globalInt :UInt32 = 12345;

4
runtime/src/main/java/org/capnproto/Serialize.java
View file

@ -111,6 +111,9 @@ public final class Serialize {
return read(bb, ReaderOptions.DEFAULT_READER_OPTIONS); return read(bb, ReaderOptions.DEFAULT_READER_OPTIONS);
} }
/*
* Upon return, `bb.position()` we be at the end of the message.
*/
public static MessageReader read(ByteBuffer bb, ReaderOptions options) throws IOException { public static MessageReader read(ByteBuffer bb, ReaderOptions options) throws IOException {
bb.order(ByteOrder.LITTLE_ENDIAN); bb.order(ByteOrder.LITTLE_ENDIAN);
@ -139,6 +142,7 @@ public final class Serialize {
totalWords += segmentSize; totalWords += segmentSize;
} }
bb.position(segmentBase + totalWords * Constants.BYTES_PER_WORD);
if (totalWords > options.traversalLimitInWords) { if (totalWords > options.traversalLimitInWords) {
throw new DecodeException("Message size exceeds traversal limit."); throw new DecodeException("Message size exceeds traversal limit.");