X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttngctl%2Flttngctl.c;h=4b803dc5b06e4ee76a56caf388d6af3b7911cd18;hb=28ba3f4e591845d044b329db5ac80e9558ed1fc8;hp=c2b1242d8c4897c6df6c912e2f6131f36ad6a895;hpb=007953922e4d3f9f96b896cddb1c4dceddccc26e;p=lttng-tools.git

diff --git a/liblttngctl/lttngctl.c b/liblttngctl/lttngctl.c
index c2b1242d8..4b803dc5b 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;