diff options
| author |  jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-07-18 00:47:59 +0000 |
|---|---|---|
| committer | jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2014-07-18 00:47:59 +0000 |
| commit | 4de8f55113007fdc8e34107950e605fc0209d465 (patch) | |
| tree | 92b7da8757a7740d9e1f2d3ead233542947d8c8c /src/google/protobuf/io/zero_copy_stream_impl.cc | |
| parent | c5553a3d18f80132b9079c5504bc0aa1f7f950a0 (diff) | |
down integrate to svn
Diffstat (limited to 'src/google/protobuf/io/zero_copy_stream_impl.cc')
| -rw-r--r-- | src/google/protobuf/io/zero_copy_stream_impl.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/google/protobuf/io/zero_copy_stream_impl.cc b/src/google/protobuf/io/zero_copy_stream_impl.cc index 9fcbb622..7829a29f 100644 --- a/src/google/protobuf/io/zero_copy_stream_impl.cc +++ b/src/google/protobuf/io/zero_copy_stream_impl.cc @@ -413,7 +413,9 @@ int64 ConcatenatingInputStream::ByteCount() const { LimitingInputStream::LimitingInputStream(ZeroCopyInputStream* input, int64 limit) - : input_(input), limit_(limit) {} + : input_(input), limit_(limit) { + prior_bytes_read_ = input_->ByteCount(); +} LimitingInputStream::~LimitingInputStream() { // If we overshot the limit, back up. @@ -457,9 +459,9 @@ bool LimitingInputStream::Skip(int count) { int64 LimitingInputStream::ByteCount() const { if (limit_ < 0) { - return input_->ByteCount() + limit_; + return input_->ByteCount() + limit_ - prior_bytes_read_; } else { - return input_->ByteCount(); + return input_->ByteCount() - prior_bytes_read_; } } |