Fix: Uninitialized scalar variable in consumer

[lttng-tools.git] / src / common / consumer.c

diff --git a/src/common/consumer.c b/src/common/consumer.c
index c4518cc03a7d8891715704cd40a8983f50d08650..2dd463c1431f72e9fd1bf35d8551fddad5b28f4a 100644 (file)
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -99,6 +99,8 @@ static void notify_channel_pipe(struct lttng_consumer_local_data *ctx,
        struct consumer_channel_msg msg;
        int ret;
 
+       memset(&msg, 0, sizeof(msg));
+
        msg.action = action;
        msg.chan = chan;
        do {
@@ -1424,6 +1426,8 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
                                goto end;
                        }
                        outfd = stream->out_fd = ret;
+                       /* Reset current size because we just perform a rotation. */
+                       stream->tracefile_size_current = 0;
                }
                stream->tracefile_size_current += len;
        }
@@ -1604,6 +1608,8 @@ ssize_t lttng_consumer_on_read_subbuffer_splice(
                                goto end;
                        }
                        outfd = stream->out_fd = ret;
+                       /* Reset current size because we just perform a rotation. */
+                       stream->tracefile_size_current = 0;
                }
                stream->tracefile_size_current += len;
        }