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

diff --git a/liblttngctl/lttngctl.c b/liblttngctl/lttngctl.c
index b83d5ca92..4b803dc5b 100644
--- a/liblttngctl/lttngctl.c
+++ b/liblttngctl/lttngctl.c
@@ -152,6 +152,10 @@ static int check_tracing_group(const char *grp_name)
 
 	/* Alloc group list of the right size */
 	grp_list = malloc(grp_list_size * sizeof(gid_t));
+	if (!grp_list) {
+		ret = -1;
+		goto end;
+	}
 	grp_id = getgroups(grp_list_size, grp_list);
 	if (grp_id < -1) {
 		perror("getgroups");
@@ -343,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;