From 0233a6a578456d763172c241a99ed7254fa50998 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Mon, 4 Nov 2013 16:34:38 -0500 Subject: [PATCH] Fix: Uninitialized scalar variable Fix coverity issue 1099611. Signed-off-by: David Goulet --- src/bin/lttng-relayd/live.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c index 1bcab0a85..26d6e33d5 100644 --- a/src/bin/lttng-relayd/live.c +++ b/src/bin/lttng-relayd/live.c @@ -1128,6 +1128,9 @@ int viewer_get_packet(struct relay_command *cmd) } health_code_update(); + /* From this point on, the error label can be reached. */ + memset(&reply, 0, sizeof(reply)); + rcu_read_lock(); stream = live_find_viewer_stream_by_id(be64toh(get_packet_info.stream_id)); if (!stream) { @@ -1156,14 +1159,11 @@ int viewer_get_packet(struct relay_command *cmd) stream->read_fd = ret; } - memset(&reply, 0, sizeof(reply)); - if (!stream->ctf_trace->metadata_received || stream->ctf_trace->metadata_received > stream->ctf_trace->metadata_sent) { reply.status = htobe32(VIEWER_GET_PACKET_ERR); reply.flags |= LTTNG_VIEWER_FLAG_NEW_METADATA; - goto send_reply; } -- 2.34.1