X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttngctl%2Flttngctl.c;fp=liblttngctl%2Flttngctl.c;h=0442a4f02bdbc686a868bf1abbc40a1896420894;hp=bec1dbb8503c60da423e2f2f7f44161382b69e27;hb=8c9ae521a34f2d83c42ced6b00a599518e8473e8;hpb=9928e7b733043d2f44bd2a4b0e041a0553fd427f

diff --git a/liblttngctl/lttngctl.c b/liblttngctl/lttngctl.c
index bec1dbb85..0442a4f02 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 && ev->name[0] != '\0') {
+	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));