X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=001abffcd925705fbcee43a613ed055e2cea50c7;hb=f5d98ed9e6017de4d7146fd4a19dad4dab5471e3;hp=60dcdc7d33872cbf190e79b1dfe9e3385f72e545;hpb=64eafdf60552bbd7e22fb1c8fc8fc2b42a3cf68b;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 60dcdc7d3..001abffcd 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -2243,7 +2243,7 @@ int lttng_list_events(struct lttng_handle *handle,
 
 	cmd_header_view = lttng_buffer_view_from_dynamic_buffer(
 		&payload.buffer, 0, sizeof(*cmd_header));
-	if (!cmd_header_view.data) {
+	if (!lttng_buffer_view_is_valid(&cmd_header_view)) {
 		ret = -LTTNG_ERR_INVALID_PROTOCOL;
 		goto end;
 	}
@@ -2310,6 +2310,11 @@ int lttng_list_events(struct lttng_handle *handle,
 								payload_view.buffer.data,
 						ext_comm->userspace_probe_location_len);
 
+				if (!lttng_payload_view_is_valid(&probe_location_view)) {
+					ret = -LTTNG_ERR_PROBE_LOCATION_INVAL;
+					goto end;
+				}
+
 				/*
 				 * Create a temporary userspace probe location
 				 * to determine the size needed by a "flattened"
@@ -2449,6 +2454,11 @@ int lttng_list_events(struct lttng_handle *handle,
 								payload_copy_view.buffer.data,
 						ext_comm->userspace_probe_location_len);
 
+				if (!lttng_payload_view_is_valid(&probe_location_view)) {
+					ret = -LTTNG_ERR_PROBE_LOCATION_INVAL;
+					goto free_dynamic_buffer;
+				}
+
 				ret = lttng_userspace_probe_location_create_from_payload(
 						&probe_location_view,
 						&probe_location);
@@ -2956,11 +2966,13 @@ int lttng_register_trigger(struct lttng_trigger *trigger)
 	struct lttcomm_session_msg *message_lsm;
 	struct lttng_payload message;
 	struct lttng_payload reply;
+	struct lttng_trigger *reply_trigger = NULL;
 	const struct lttng_credentials user_creds = {
 		.uid = LTTNG_OPTIONAL_INIT_VALUE(geteuid()),
 		.gid = LTTNG_OPTIONAL_INIT_UNSET,
 	};
 
+
 	lttng_payload_init(&message);
 	lttng_payload_init(&reply);
 
@@ -3032,10 +3044,30 @@ int lttng_register_trigger(struct lttng_trigger *trigger)
 		}
 	}
 
+	{
+		struct lttng_payload_view reply_view =
+				lttng_payload_view_from_payload(
+						&reply, 0, reply.buffer.size);
+
+		ret = lttng_trigger_create_from_payload(
+				&reply_view, &reply_trigger);
+		if (ret < 0) {
+			ret = -LTTNG_ERR_FATAL;
+			goto end;
+		}
+	}
+
+	ret = lttng_trigger_assign_name(trigger, reply_trigger);
+	if (ret < 0) {
+		ret = -LTTNG_ERR_FATAL;
+		goto end;
+	}
+
 	ret = 0;
 end:
 	lttng_payload_reset(&message);
 	lttng_payload_reset(&reply);
+	lttng_trigger_destroy(reply_trigger);
 	return ret;
 }