# HG changeset patch
# User Jim Meyering <jim@meyering.net>
# Date 926743826 0
# Node ID d9e10c32984556090656d6f528771c4dc55401da
# Parent  2a63a615fc73d9758809c291e5b5c4524d6e792f
(getugroups): Don't dereference a null pointer when
running `id USER' for some USER that is listed on the RHS in /etc/group.
From Sander van Malssen.
Add some curly braces, use STREQ, reverse the sense of a test
and use `continue' to save a level of nesting.

diff --git a/lib/getugroups.c b/lib/getugroups.c
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -41,6 +41,8 @@
 # include <strings.h>
 #endif
 
+#define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
+
 /* Like `getgroups', but for user USERNAME instead of for the current
    process.  Store at most MAXCOUNT group IDs in the GROUPLIST array.
    If GID is not -1, store it first (if possible).  GID should be the
@@ -64,14 +66,17 @@
 
   setgrent ();
   while ((grp = getgrent ()) != 0)
-    for (cp = grp->gr_mem; *cp; ++cp)
-      if (!strcmp (username, *cp))
+    {
+      for (cp = grp->gr_mem; *cp; ++cp)
 	{
 	  int n;
 
+	  if ( ! STREQ (username, *cp))
+	    continue;
+
 	  /* See if this group number is already on the list.  */
 	  for (n = 0; n < count; ++n)
-	    if (grouplist[n] == grp->gr_gid)
+	    if (grouplist && grouplist[n] == grp->gr_gid)
 	      break;
 
 	  /* If it's a new group number, then try to add it to the list.  */
@@ -89,6 +94,8 @@
 	      count++;
 	    }
 	}
+    }
   endgrent ();
+
   return count;
 }