X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fcondition.c;h=cffe6cf5e2b7408034781f23063681bebe9f2f7c;hp=427c49e093ec3c4621161d32f94eefba730e7bf7;hb=3e6e0df2f8f9f23d252c2508b6d741916dfcc4b3;hpb=8a82be4c62d09a7ef4792c0eed7c7903dfac8424

diff --git a/src/common/condition.c b/src/common/condition.c
index 427c49e09..cffe6cf5e 100644
--- a/src/common/condition.c
+++ b/src/common/condition.c
@@ -132,16 +132,25 @@ ssize_t lttng_condition_create_from_payload(
 		struct lttng_condition **condition)
 {
 	ssize_t ret, condition_size = 0;
-	const struct lttng_condition_comm *condition_comm;
 	condition_create_from_payload_cb create_from_payload = NULL;
+	const struct lttng_condition_comm *condition_comm;
+	const struct lttng_payload_view condition_comm_view =
+			lttng_payload_view_from_view(
+					view, 0, sizeof(*condition_comm));
 
 	if (!view || !condition) {
 		ret = -1;
 		goto end;
 	}
 
+	if (!lttng_payload_view_is_valid(&condition_comm_view)) {
+		/* Payload not large enough to contain the header. */
+		ret = -1;
+		goto end;
+	}
+
 	DBG("Deserializing condition from buffer");
-	condition_comm = (typeof(condition_comm)) view->buffer.data;
+	condition_comm = (typeof(condition_comm)) condition_comm_view.buffer.data;
 	condition_size += sizeof(*condition_comm);
 
 	switch ((enum lttng_condition_type) condition_comm->condition_type) {