X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fbuffer-usage.c;h=5f68608001a43d3559d527541c974e8edc0eef73;hp=ad6fb84169e03bd1b99cf72c74eb2e5d9bbd5c46;hb=3e6e0df2f8f9f23d252c2508b6d741916dfcc4b3;hpb=8a82be4c62d09a7ef4792c0eed7c7903dfac8424

diff --git a/src/common/buffer-usage.c b/src/common/buffer-usage.c
index ad6fb8416..5f6860800 100644
--- a/src/common/buffer-usage.c
+++ b/src/common/buffer-usage.c
@@ -251,17 +251,20 @@ ssize_t init_condition_from_payload(struct lttng_condition *condition,
 	ssize_t ret, condition_size;
 	enum lttng_condition_status status;
 	enum lttng_domain_type domain_type;
-	const struct lttng_condition_buffer_usage_comm *condition_comm;
 	const char *session_name, *channel_name;
 	struct lttng_buffer_view names_view;
+	const struct lttng_condition_buffer_usage_comm *condition_comm;
+	const struct lttng_payload_view condition_comm_view =
+			lttng_payload_view_from_view(
+					src_view, 0, sizeof(*condition_comm));
 
-	if (src_view->buffer.size < sizeof(*condition_comm)) {
+	if (!lttng_payload_view_is_valid(&condition_comm_view)) {
 		ERR("Failed to initialize from malformed condition buffer: buffer too short to contain header");
 		ret = -1;
 		goto end;
 	}
 
-	condition_comm = (typeof(condition_comm)) src_view->buffer.data;
+	condition_comm = (typeof(condition_comm)) condition_comm_view.buffer.data;
 	names_view = lttng_buffer_view_from_view(&src_view->buffer,
 			sizeof(*condition_comm), -1);