X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=b57be223a73afce55723c858c66a5aedfa245b24;hp=b0fe8ab74af65ad5565d184cf304cb6da82f4dd1;hb=2c2de71ef6dae09fa1a61f02051b68f60b0a1750;hpb=c2a1f65b2a2d3e702a4bf67c89acf12a1a2643ed

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index b0fe8ab74..b57be223a 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -2114,6 +2114,7 @@ int lttng_list_events(struct lttng_handle *handle,
 					ext_comm->nb_exclusions * LTTNG_SYMBOL_NAME_LEN);
 			if (ret) {
 				ret = -LTTNG_ERR_NOMEM;
+				goto free_dynamic_buffer;
 			}
 			comm_ext_at += ext_comm->nb_exclusions * LTTNG_SYMBOL_NAME_LEN;
 		}
@@ -2743,6 +2744,9 @@ int lttng_list_tracker_pids(struct lttng_handle *handle,
 		return ret;
 	}
 	nr_pids = ret / sizeof(int32_t);
+	if (nr_pids > 0 && !pids) {
+		return -LTTNG_ERR_UNK;
+	}
 	if (nr_pids == 1 && pids[0] == -1) {
 		free(pids);
 		pids = NULL;
@@ -2889,50 +2893,6 @@ end:
 	return ret;
 }
 
-int lttng_session_get_current_archive_location(const char *session_name,
-		char **chunk_path)
-{
-	struct lttcomm_session_msg lsm;
-	struct lttng_session_get_current_output_return *output_return = NULL;
-	int ret;
-	size_t path_len;
-
-	memset(&lsm, 0, sizeof(lsm));
-	lsm.cmd_type = LTTNG_SESSION_GET_CURRENT_OUTPUT;
-	ret = lttng_strncpy(lsm.session.name, session_name,
-			sizeof(lsm.session.name));
-	if (ret) {
-		ret = -LTTNG_ERR_INVALID;
-		goto end;
-	}
-
-	ret = lttng_ctl_ask_sessiond(&lsm, (void **) &output_return);
-	if (ret < 0) {
-		ret = -1;
-		goto end;
-	}
-
-	path_len = lttng_strnlen(output_return->path,
-			sizeof(output_return->path));
-	if (path_len == 0 || path_len == sizeof(output_return->path)) {
-		ret = -LTTNG_ERR_NO_SESSION_OUTPUT;
-		goto end;
-	}
-
-	*chunk_path = zmalloc(path_len + 1);
-	if (!*chunk_path) {
-		ret = -1;
-		goto end;
-	}
-	memcpy(*chunk_path, output_return->path, path_len);
-
-	ret = 0;
-
-end:
-	free(output_return);
-	return ret;
-}
-
 /*
  * lib constructor.
  */