From 57b9d84394c89ba794981ca171c71e7a8fe84d9e Mon Sep 17 00:00:00 2001 From: Julien Desfossez Date: Fri, 17 Jan 2014 13:11:39 -0500 Subject: [PATCH] Fix: replace assert with proper error handling MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit If we receive the wrong packet, we should send the error and exit cleanly instead of asserting. Signed-off-by: Julien Desfossez Signed-off-by: Jérémie Galarneau --- formats/lttng-live/lttng-live-functions.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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); -- 2.34.1