From: Julien Desfossez <jdesfossez@efficios.com>
Date: Fri, 17 Jan 2014 18:11:39 +0000 (-0500)
Subject: Fix: replace assert with proper error handling
X-Git-Tag: v1.2.0-rc1~16
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=57b9d84394c89ba794981ca171c71e7a8fe84d9e

Fix: replace assert with proper error handling

If we receive the wrong packet, we should send the error and exit
cleanly instead of asserting.

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/formats/lttng-live/lttng-live-functions.c b/formats/lttng-live/lttng-live-functions.c
index aee78cbf..1f4b4dbc 100644
--- a/formats/lttng-live/lttng-live-functions.c
+++ b/formats/lttng-live/lttng-live-functions.c
@@ -454,7 +454,13 @@ int get_data_packet(struct lttng_live_ctx *ctx,
 		ret = ret_len;
 		goto error;
 	}
-	assert(ret_len == sizeof(rp));
+	if (ret_len != sizeof(rp)) {
+		fprintf(stderr, "[error] get_data_packet: expected %" PRId64
+				", received %" PRId64 "\n", ret_len,
+				sizeof(rp));
+		ret = -1;
+		goto error;
+	}
 
 	rp.flags = be32toh(rp.flags);