From 96879dc69ed4004375bcfbf334e598ea55f19326 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 27 Dec 2017 15:23:33 +0100 Subject: EncodeBuffer.cpp: add VALGRIND guard Same as in WriteBuffer.cpp Valgrind will complain about uninitialized data, but we are only writing to the memory here. --- nxcomp/src/EncodeBuffer.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'nxcomp/src/EncodeBuffer.cpp') diff --git a/nxcomp/src/EncodeBuffer.cpp b/nxcomp/src/EncodeBuffer.cpp index e112113a8..6e6a30e77 100644 --- a/nxcomp/src/EncodeBuffer.cpp +++ b/nxcomp/src/EncodeBuffer.cpp @@ -70,6 +70,13 @@ EncodeBuffer::EncodeBuffer() initialSize_ = ENCODE_BUFFER_DEFAULT_SIZE; thresholdSize_ = ENCODE_BUFFER_DEFAULT_SIZE << 1; maximumSize_ = ENCODE_BUFFER_DEFAULT_SIZE << 4; + + #ifdef VALGRIND + + memset(buffer_, '\0', size_); + + #endif + } EncodeBuffer::~EncodeBuffer() -- cgit v1.2.3 From 367bec59524ffc3d005ae8908c5edf42e9b01ca7 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 29 Dec 2017 14:25:53 +0100 Subject: EncodeBuffer.cpp: add another VALGRIND guard Fixes ArcticaProject/nx-libs#572 --- nxcomp/src/EncodeBuffer.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'nxcomp/src/EncodeBuffer.cpp') diff --git a/nxcomp/src/EncodeBuffer.cpp b/nxcomp/src/EncodeBuffer.cpp index 6e6a30e77..e6af38b71 100644 --- a/nxcomp/src/EncodeBuffer.cpp +++ b/nxcomp/src/EncodeBuffer.cpp @@ -108,7 +108,15 @@ void EncodeBuffer::fullReset() size_ = initialSize_; buffer_ = new unsigned char[size_ + ENCODE_BUFFER_PREFIX_SIZE + - ENCODE_BUFFER_POSTFIX_SIZE] + ENCODE_BUFFER_PREFIX_SIZE; + ENCODE_BUFFER_POSTFIX_SIZE]; + + #ifdef VALGRIND + + memset(buffer_, '\0', size_ + ENCODE_BUFFER_PREFIX_SIZE + ENCODE_BUFFER_POSTFIX_SIZE); + + #endif + + buffer_ += ENCODE_BUFFER_PREFIX_SIZE; } end_ = buffer_ + size_; -- cgit v1.2.3