X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttngctl%2Flttngctl.c;h=26b721e9928e469dd57e6ba09a696542c87fd799;hp=c2b1242d8c4897c6df6c912e2f6131f36ad6a895;hb=0133c1990185d0374ec06a751da23b7a84c54d78;hpb=007953922e4d3f9f96b896cddb1c4dceddccc26e

diff --git a/liblttngctl/lttngctl.c b/liblttngctl/lttngctl.c
index c2b1242d8..26b721e99 100644
--- a/liblttngctl/lttngctl.c
+++ b/liblttngctl/lttngctl.c
@@ -21,18 +21,17 @@
  */
 
 #define _GNU_SOURCE
-#include <errno.h>
 #include <grp.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include <lttng/lttng.h>
-
 #include <lttng-sessiond-comm.h>
-#include "lttngerr.h"
-#include "lttng-share.h"
+#include <lttng-share.h>
+#include <lttng/lttng.h>
+#include <lttngerr.h>
 
 /* Socket to session daemon for communication */
 static int sessiond_socket;
@@ -348,6 +347,16 @@ static int ask_sessiond(struct lttcomm_session_msg *lsm, void **buf)
 		goto end;
 	}
 
+	/*
+	 * Extra protection not to dereference a NULL pointer. If buf is NULL at
+	 * this point, an error is returned and data is freed.
+	 */
+	if (buf == NULL) {
+		ret = -1;
+		free(data);
+		goto end;
+	}
+
 	*buf = data;
 	ret = size;
 
@@ -497,7 +506,7 @@ int lttng_enable_event(struct lttng_handle *handle,
 
 	copy_lttng_domain(&lsm.domain, &handle->domain);
 
-	if (ev) {
+	if (ev || ev->name[0] != '\0') {
 		lsm.cmd_type = LTTNG_ENABLE_EVENT;
 		memcpy(&lsm.u.enable.event, ev, sizeof(lsm.u.enable.event));
 	} else {