X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttngctl%2Flttngctl.c;h=d0ba52bbf419d8a8b026a4316e3212271f0aef44;hp=4b803dc5b06e4ee76a56caf388d6af3b7911cd18;hb=a45d55367ba37e6561f709e2397b6d51126fb735;hpb=f8f0c3d1337c4eda5fb76a323ffe6c21c926a21e

diff --git a/liblttngctl/lttngctl.c b/liblttngctl/lttngctl.c
index 4b803dc5b..d0ba52bbf 100644
--- a/liblttngctl/lttngctl.c
+++ b/liblttngctl/lttngctl.c
@@ -334,6 +334,10 @@ static int ask_sessiond(struct lttcomm_session_msg *lsm, void **buf)
 
 	size = llm.data_size;
 	if (size == 0) {
+		/* If client free with size 0 */
+		if (buf != NULL) {
+			*buf = NULL;
+		}
 		ret = 0;
 		goto end;
 	}
@@ -492,7 +496,7 @@ int lttng_enable_event(struct lttng_handle *handle,
 {
 	struct lttcomm_session_msg lsm;
 
-	if (!handle) {
+	if (!handle || ev == NULL) {
 		return -1;
 	}
 
@@ -506,12 +510,12 @@ int lttng_enable_event(struct lttng_handle *handle,
 
 	copy_lttng_domain(&lsm.domain, &handle->domain);
 
-	if (ev) {
+	if (ev->name[0] != '\0') {
 		lsm.cmd_type = LTTNG_ENABLE_EVENT;
-		memcpy(&lsm.u.enable.event, ev, sizeof(lsm.u.enable.event));
 	} else {
 		lsm.cmd_type = LTTNG_ENABLE_ALL_EVENT;
 	}
+	memcpy(&lsm.u.enable.event, ev, sizeof(lsm.u.enable.event));
 
 	copy_string(lsm.session.name, handle->session_name,
 			sizeof(lsm.session.name));
@@ -541,7 +545,7 @@ int lttng_disable_event(struct lttng_handle *handle, const char *name,
 
 	copy_lttng_domain(&lsm.domain, &handle->domain);
 
-	if (name == NULL) {
+	if (name != NULL) {
 		copy_string(lsm.u.disable.name, name, sizeof(lsm.u.disable.name));
 		lsm.cmd_type = LTTNG_DISABLE_EVENT;
 	} else {
@@ -636,7 +640,7 @@ int lttng_list_tracepoints(struct lttng_handle *handle,
 /*
  *  Return a human readable string of code
  */
-const char *lttng_get_readable_code(int code)
+const char *lttng_strerror(int code)
 {
 	if (code > -LTTCOMM_OK) {
 		return "Ended with errors";