Fix: dynamic buffer mishandles setting capacity to 0

[lttng-tools.git] / src / common / dynamic-buffer.c

diff --git a/src/common/dynamic-buffer.c b/src/common/dynamic-buffer.c
index fd39f813b3c2568beec2dff1be91343161ec8517..cec2f1e608a67d1e0a148c491c8a8015ce5f27dc 100644 (file)
--- a/src/common/dynamic-buffer.c
+++ b/src/common/dynamic-buffer.c
@@ -148,7 +148,8 @@ int lttng_dynamic_buffer_set_capacity(struct lttng_dynamic_buffer *buffer,
 {
        int ret = 0;
        void *new_buf;
-       size_t new_capacity = round_to_power_of_2(demanded_capacity);
+       size_t new_capacity = demanded_capacity ?
+                       round_to_power_of_2(demanded_capacity) : 0;
 
        if (!buffer || demanded_capacity < buffer->size) {
                /*
@@ -186,3 +187,13 @@ void lttng_dynamic_buffer_reset(struct lttng_dynamic_buffer *buffer)
        buffer->_capacity = 0;
        free(buffer->data);
 }
+
+LTTNG_HIDDEN
+size_t lttng_dynamic_buffer_get_capacity_left(
+               struct lttng_dynamic_buffer *buffer)
+{
+       if (!buffer) {
+               return 0;
+       }
+       return buffer->_capacity - buffer->size;
+}