diff options
| author | Wink Saville <wink@google.com> | 2011-06-20 22:36:42 -0700 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2011-06-20 22:36:42 -0700 |
| commit | 8a2f7578bb6289415f1d0a01c9cc96d283730480 (patch) | |
| tree | 2d03d98e2f0d62e2bfa7a0e7ec4bfed9a55e41ea /java/src/main/java/com/google/protobuf/CodedInputStream.java | |
| parent | 9fdd84ae4554a30d2a986a9b3ada9300296e4870 (diff) | |
| download | external_protobuf-8a2f7578bb6289415f1d0a01c9cc96d283730480.zip external_protobuf-8a2f7578bb6289415f1d0a01c9cc96d283730480.tar.gz external_protobuf-8a2f7578bb6289415f1d0a01c9cc96d283730480.tar.bz2 | |
Fix bug in skipRawBytes if request is larger than buffer.
Original solution by Scott Barta this change adds tests
and also fixes the same bug that was in CodedInputStream.
Change-Id: Idb49691822b3f292c5092edc52db4e153e9da49a
Diffstat (limited to 'java/src/main/java/com/google/protobuf/CodedInputStream.java')
| -rw-r--r-- | java/src/main/java/com/google/protobuf/CodedInputStream.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/main/java/com/google/protobuf/CodedInputStream.java b/java/src/main/java/com/google/protobuf/CodedInputStream.java index ad43f96..22995e9 100644 --- a/java/src/main/java/com/google/protobuf/CodedInputStream.java +++ b/java/src/main/java/com/google/protobuf/CodedInputStream.java @@ -847,7 +847,7 @@ public final class CodedInputStream { } else { // Skipping more bytes than are in the buffer. First skip what we have. int pos = bufferSize - bufferPos; - totalBytesRetired += pos; + totalBytesRetired += bufferSize; bufferPos = 0; bufferSize = 0; |