X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=b0fe8ab74af65ad5565d184cf304cb6da82f4dd1;hb=c2a1f65b2a2d3e702a4bf67c89acf12a1a2643ed;hp=0dd12b26f3222584e2b53703a37364ce76c2dcb4;hpb=ec005ec6d2d9e72e44b6614a573114f03669f242;p=lttng-tools.git

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 0dd12b26f..b0fe8ab74 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -1959,6 +1959,11 @@ int lttng_list_events(struct lttng_handle *handle,
 		goto end;
 	}
 
+	if (!cmd_header) {
+		ret = -LTTNG_ERR_UNK;
+		goto end;
+	}
+
 	/* Set number of events and free command header */
 	nb_events = cmd_header->nb_events;
 	if (nb_events > INT_MAX) {
@@ -2034,7 +2039,6 @@ int lttng_list_events(struct lttng_handle *handle,
 
 			probe_storage_req = ret;
 			comm_ext_at += ext_comm->userspace_probe_location_len;
-			ret = 0;
 		}
 
 		storage_req += sizeof(struct lttng_event_extended);
@@ -2722,7 +2726,7 @@ int lttng_list_tracker_pids(struct lttng_handle *handle,
 	int enabled = 1;
 	struct lttcomm_session_msg lsm;
 	size_t nr_pids;
-	int32_t *pids;
+	int32_t *pids = NULL;
 
 	if (handle == NULL) {
 		return -LTTNG_ERR_INVALID;