X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=liblttngctl%2Flttngctl.c;h=4c4cf80d33d866916510d774910a4ca231fca156;hb=f84efadf55274918ca038a4e06e0a8af1a320654;hp=4b803dc5b06e4ee76a56caf388d6af3b7911cd18;hpb=f8f0c3d1337c4eda5fb76a323ffe6c21c926a21e;p=lttng-tools.git

diff --git a/liblttngctl/lttngctl.c b/liblttngctl/lttngctl.c
index 4b803dc5b..4c4cf80d3 100644
--- a/liblttngctl/lttngctl.c
+++ b/liblttngctl/lttngctl.c
@@ -492,7 +492,7 @@ int lttng_enable_event(struct lttng_handle *handle,
 {
 	struct lttcomm_session_msg lsm;
 
-	if (!handle) {
+	if (!handle || ev == NULL) {
 		return -1;
 	}
 
@@ -506,12 +506,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 +541,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 {