X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Factions%2Fgroup.c;h=4ac239c9d62c14f43c7b2ddf0623c5e901aeaf5d;hb=cfb1c9bcab7801380b6ffbab9e505b861072254c;hp=f5720741598af8c1288c1a383e38f3bd7c9be6e0;hpb=f3a9cc3478223679d8fea55d5eedce111b462feb;p=lttng-tools.git

diff --git a/src/common/actions/group.c b/src/common/actions/group.c
index f57207415..4ac239c9d 100644
--- a/src/common/actions/group.c
+++ b/src/common/actions/group.c
@@ -16,7 +16,7 @@
 #include <lttng/action/group.h>
 
 #define IS_GROUP_ACTION(action) \
-	(lttng_action_get_type_const(action) == LTTNG_ACTION_TYPE_GROUP)
+	(lttng_action_get_type(action) == LTTNG_ACTION_TYPE_GROUP)
 
 struct lttng_action_group {
 	struct lttng_action parent;
@@ -217,6 +217,11 @@ ssize_t lttng_action_group_create_from_payload(
 				lttng_payload_view_from_view(view, consumed_len,
 						view->buffer.size - consumed_len);
 
+		if (!lttng_payload_view_is_valid(&child_view)) {
+			consumed_len = -1;
+			goto end;
+		}
+
 		consumed_len_child = lttng_action_create_from_payload(
 				&child_view, &child_action);
 		if (consumed_len_child < 0) {