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

Merge pull request #96 from wdu/master

Browse source 
Offer option to disable traversalLimitInWords
This commit is contained in:
David Renshaw 2021-05-09 14:47:02 -04:00 committed by GitHub
commit 854997703d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
runtime/src/main/java/org/capnproto/ReaderArena.java
View file

@ -45,11 +45,13 @@ public final class ReaderArena implements Arena {
} }
@Override @Override
public final void checkReadLimit(int numBytes) { public final void checkReadLimit(int numWords) {
if (numBytes > limit) { if (limit == -1) {
return;
} else if (numWords > limit) {
throw new DecodeException("Read limit exceeded."); throw new DecodeException("Read limit exceeded.");
} else { } else {
limit -= numBytes; limit -= numWords;
} }
} }
} }

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

@ -145,7 +145,7 @@ public final class Serialize {
} }
bb.position(segmentBase + totalWords * Constants.BYTES_PER_WORD); bb.position(segmentBase + totalWords * Constants.BYTES_PER_WORD);
if (totalWords > options.traversalLimitInWords) { if (options.traversalLimitInWords != -1 && totalWords > options.traversalLimitInWords) {
throw new DecodeException("Message size exceeds traversal limit."); throw new DecodeException("Message size exceeds traversal limit.");
} }