aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/text_format.cc
diff options
context:
space:
mode:
authorGravatar John Millikin <jmillikin@stripe.com>2017-10-16 12:05:21 -0700
committerGravatar John Millikin <jmillikin@stripe.com>2017-10-16 12:05:21 -0700
commitaff10976fc7722b1174fc3dcce15bfe8ebdfcbcd (patch)
tree5c6a858ce30c8ed183dc4f88c6f55d758e0b3354 /src/google/protobuf/text_format.cc
parentf850188e6e1021b4fe21ecb0aca548a54c272ce5 (diff)
Fix undefined memory management found by Clang's sanitizers.
Diffstat (limited to 'src/google/protobuf/text_format.cc')
-rw-r--r--src/google/protobuf/text_format.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/google/protobuf/text_format.cc b/src/google/protobuf/text_format.cc
index 2ea97785..eed2a768 100644
--- a/src/google/protobuf/text_format.cc
+++ b/src/google/protobuf/text_format.cc
@@ -1244,10 +1244,12 @@ class TextFormat::Printer::TextGenerator
while (size > buffer_size_) {
// Data exceeds space in the buffer. Copy what we can and request a
// new buffer.
- memcpy(buffer_, data, buffer_size_);
- data += buffer_size_;
- size -= buffer_size_;
- void* void_buffer;
+ if (buffer_size_ > 0) {
+ memcpy(buffer_, data, buffer_size_);
+ data += buffer_size_;
+ size -= buffer_size_;
+ }
+ void* void_buffer = NULL;
failed_ = !output_->Next(&void_buffer, &buffer_size_);
if (failed_) return;
buffer_ = reinterpret_cast<char*>(void_buffer);