From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 25 Aug 2015 11:53:07 +0000 (-0400)
Subject: Fix: reply error if get packet vstream fails
X-Git-Tag: v2.6.1~36
X-Git-Url: https://git.liburcu.org/?a=commitdiff_plain;h=4da923bd137a8bccae82a477ca59e1c061f95e75;p=lttng-tools.git

Fix: reply error if get packet vstream fails

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 7b1602d36..14b307273 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -1478,7 +1478,8 @@ int viewer_get_packet(struct relay_connection *conn)
 
 	vstream = viewer_stream_get_by_id(be64toh(get_packet_info.stream_id));
 	if (!vstream) {
-		goto error;
+		reply.status = htobe32(LTTNG_VIEWER_GET_PACKET_ERR);
+		goto send_reply_nolock;
 	}
 
 	ctf_trace = vstream->stream->trace;