diff options
author | Brian Duff <bduff@google.com> | 2015-04-21 23:33:41 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-21 23:33:41 +0000 |
commit | c68dba6080b13aba4f72bcf616f29af8e0bf617e (patch) | |
tree | c17053aa432de03c0d2213c63670fe3c4f3f6aa7 /java/src/main/java/com/google/protobuf/nano | |
parent | 2eadf946678a8a8d3cd56188454ab106b8dc5a39 (diff) | |
parent | a07081b82c9a7b3da4a4a0cb577748c66bf2bf9e (diff) | |
download | external_protobuf-c68dba6080b13aba4f72bcf616f29af8e0bf617e.zip external_protobuf-c68dba6080b13aba4f72bcf616f29af8e0bf617e.tar.gz external_protobuf-c68dba6080b13aba4f72bcf616f29af8e0bf617e.tar.bz2 |
am a07081b8: am 63b42c8d: am 92f1bf25: Merge "Throw OutOfSpaceException instead of IllegalArgumentException."
* commit 'a07081b82c9a7b3da4a4a0cb577748c66bf2bf9e':
Throw OutOfSpaceException instead of IllegalArgumentException.
Diffstat (limited to 'java/src/main/java/com/google/protobuf/nano')
-rw-r--r-- | java/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/java/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java b/java/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java index 324a63f..53060da 100644 --- a/java/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java +++ b/java/src/main/java/com/google/protobuf/nano/CodedOutputByteBufferNano.java @@ -300,6 +300,12 @@ public final class CodedOutputByteBufferNano { final int maxLengthVarIntSize = computeRawVarint32Size(value.length() * MAX_UTF8_EXPANSION); if (minLengthVarIntSize == maxLengthVarIntSize) { int oldPosition = buffer.position(); + // Buffer.position, when passed a position that is past its limit, throws + // IllegalArgumentException, and this class is documented to throw + // OutOfSpaceException instead. + if (buffer.remaining() < minLengthVarIntSize) { + throw new OutOfSpaceException(oldPosition + minLengthVarIntSize, buffer.limit()); + } buffer.position(oldPosition + minLengthVarIntSize); encode(value, buffer); int newPosition = buffer.position(); @@ -311,7 +317,10 @@ public final class CodedOutputByteBufferNano { encode(value, buffer); } } catch (BufferOverflowException e) { - throw new OutOfSpaceException(buffer.position(), buffer.limit()); + final OutOfSpaceException outOfSpaceException = new OutOfSpaceException(buffer.position(), + buffer.limit()); + outOfSpaceException.initCause(e); + throw outOfSpaceException; } } |