From d6f96fa07e06b4f8d1c7e9ea5d12848aa0342bbe Mon Sep 17 00:00:00 2001
From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Sun, 27 Jul 2008 22:30:31 +0000
Subject: [PATCH] 	* src/groupmems.c (whoami): Make sure usr and grp are
 not NULL 	before dereferencing them.

---
 ChangeLog       | 5 +++++
 src/groupmems.c | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 871783da..aef35493 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-27  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* src/groupmems.c (whoami): Make sure usr and grp are not NULL
+	before dereferencing them.
+
 2008-07-27  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* src/groupmems.c: Use xstrdup() rather than strdup().
diff --git a/src/groupmems.c b/src/groupmems.c
index e68d6872..9a2c2c7e 100644
--- a/src/groupmems.c
+++ b/src/groupmems.c
@@ -85,7 +85,9 @@ static char *whoami (void)
 	/* local, no need for xgetpwuid */
 	struct passwd *usr = getpwuid (getuid ());
 
-	if (0 == strcmp (usr->pw_name, grp->gr_name)) {
+	if (   (NULL != usr)
+	    && (NULL != grp)
+	    && (0 == strcmp (usr->pw_name, grp->gr_name))) {
 		return xstrdup (usr->pw_name);
 	} else {
 		return NULL;