From: David Goulet <david.goulet@polymtl.ca>
Date: Fri, 26 Aug 2011 20:20:03 +0000 (-0400)
Subject: Merge branch 'master' of git://git.lttng.org/lttng-tools
X-Git-Tag: v2.0-pre13~19
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=ef805c1d5319ddce9777a7b78cbbaf595a7981e2;hp=2f50c8a357cc89dacdd536edc34b606304648b0d

Merge branch 'master' of git://git.lttng.org/lttng-tools
---

diff --git a/liblttngctl/lttngctl.c b/liblttngctl/lttngctl.c
index b64ace2e6..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");