[Pkg-shadow-commits] r2225 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-07-27 22:30:31 +0000 (Sun, 27 Jul 2008)
New Revision: 2225

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/groupmems.c
Log:
	* src/groupmems.c (whoami): Make sure usr and grp are not NULL
	before dereferencing them.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-07-27 22:30:22 UTC (rev 2224)
+++ upstream/trunk/ChangeLog	2008-07-27 22:30:31 UTC (rev 2225)
@@ -1,5 +1,10 @@
 2008-07-27  Nicolas François  <nicolas.francois at 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 at centraliens.net>
+
 	* src/groupmems.c: Use xstrdup() rather than strdup().
 
 2008-07-27  Nicolas François  <nicolas.francois at centraliens.net>

Modified: upstream/trunk/src/groupmems.c
===================================================================
--- upstream/trunk/src/groupmems.c	2008-07-27 22:30:22 UTC (rev 2224)
+++ upstream/trunk/src/groupmems.c	2008-07-27 22:30:31 UTC (rev 2225)
@@ -85,7 +85,9 @@
 	/* 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;