From 6ee96b4d634b95f8cb91537515016246638189e4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Tue, 17 Oct 2017 17:22:02 -0400 Subject: [PATCH] Fix: memory is not zeroed on first set_capacity MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- src/common/dynamic-buffer.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/common/dynamic-buffer.c b/src/common/dynamic-buffer.c index cec2f1e60..aef80dded 100644 --- a/src/common/dynamic-buffer.c +++ b/src/common/dynamic-buffer.c @@ -108,22 +108,12 @@ int lttng_dynamic_buffer_set_size(struct lttng_dynamic_buffer *buffer, } if (new_size > buffer->_capacity) { - size_t original_size = buffer->size; - size_t original_capacity = buffer->_capacity; - ret = lttng_dynamic_buffer_set_capacity(buffer, new_size); if (ret) { goto end; } - /* - * Zero-initialize the space that was left in the buffer at the - * before we increased its capacity (original capacity - original size). - * The newly acquired capacity (new capacity - original capacity) - * is zeroed by lttng_dynamic_buffer_set_capacity(). - */ - memset(buffer->data + original_size, 0, - original_capacity - original_size); + memset(buffer->data + buffer->size, 0, new_size - buffer->size); } else if (new_size > buffer->size) { memset(buffer->data + buffer->size, 0, new_size - buffer->size); } else { -- 2.34.1