1 files changed, 48 insertions, 26 deletions

diff --git a/nis/nis_removemember.c b/nis/nis_removemember.c
index 2e45b4fb79..b9e27ab48c 100644
--- a/nis/nis_removemember.c
+++ b/nis/nis_removemember.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 1997,1998,1999,2004,2005,2006 Free Software Foundation, Inc.
+/* Copyright (c) 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
 
@@ -28,12 +28,15 @@ nis_removemember (const_nis_name member, const_nis_name group)
     {
       size_t grouplen = strlen (group);
       char buf[grouplen + 14 + NIS_MAXNAMELEN];
+      char leafbuf[grouplen + 2];
       char domainbuf[grouplen + 2];
+      nis_name *newmem;
       nis_result *res, *res2;
       nis_error status;
       char *cp, *cp2;
+      unsigned long int i, j, k;
 
-      cp = rawmemchr (nis_leaf_of_r (group, buf, sizeof (buf) - 1), '\0');
+      cp = stpcpy (buf, nis_leaf_of_r (group, leafbuf, sizeof (leafbuf) - 1));
       cp = stpcpy (cp, ".groups_dir");
       cp2 = nis_domain_of_r (group, domainbuf, sizeof (domainbuf) - 1);
       if (cp2 != NULL && cp2[0] != '\0')
@@ -41,41 +44,60 @@ nis_removemember (const_nis_name member, const_nis_name group)
           cp = stpcpy (cp, ".");
           stpcpy (cp, cp2);
         }
-      res = nis_lookup (buf, FOLLOW_LINKS | EXPAND_NAME);
-      if (res == NULL)
-	return NIS_NOMEMORY;
-      if (NIS_RES_STATUS (res) != NIS_SUCCESS)
+      res = nis_lookup (buf, FOLLOW_LINKS|EXPAND_NAME);
+      if (res == NULL || NIS_RES_STATUS (res) != NIS_SUCCESS)
         {
-	  status = NIS_RES_STATUS (res);
-	  nis_freeresult (res);
+	  if (res)
+	    {
+	      status = NIS_RES_STATUS (res);
+	      nis_freeresult (res);
+	    }
+	  else
+	    return NIS_NOMEMORY;
           return status;
         }
 
-      if (NIS_RES_NUMOBJ (res) != 1
-	  || __type_of (NIS_RES_OBJECT (res)) != NIS_GROUP_OBJ)
+      if ((res->objects.objects_len != 1) ||
+          (__type_of (NIS_RES_OBJECT (res)) != NIS_GROUP_OBJ))
 	{
 	  nis_freeresult (res);
 	  return NIS_INVALIDOBJ;
 	}
 
-      nis_name *gr_members_val
-	= NIS_RES_OBJECT(res)->GR_data.gr_members.gr_members_val;
-      u_int gr_members_len
-	= NIS_RES_OBJECT(res)->GR_data.gr_members.gr_members_len;
+      newmem =
+	calloc (NIS_RES_OBJECT(res)->GR_data.gr_members.gr_members_len,
+		sizeof (char *));
+      if (newmem == NULL)
+	return NIS_NOMEMORY;
 
-      u_int j = 0;
-      for (u_int i = 0; i < gr_members_len; ++i)
-	if (strcmp (gr_members_val[i], member) != 0)
-	  gr_members_val[j++] = gr_members_val[i];
-	else
-	  free (gr_members_val[i]);
+      k = NIS_RES_OBJECT (res)[0].GR_data.gr_members.gr_members_len;
+      j = 0;
+      for (i = 0; i < NIS_RES_OBJECT(res)->GR_data.gr_members.gr_members_len;
+	   ++i)
+	{
+	  if (strcmp (NIS_RES_OBJECT(res)->GR_data.gr_members.gr_members_val[i],
+		      member) != 0)
+	    {
+	      newmem[j] = NIS_RES_OBJECT(res)->GR_data.gr_members.gr_members_val[i];
+	      ++j;
+	    }
+	  else
+	    {
+	      free (NIS_RES_OBJECT(res)->GR_data.gr_members.gr_members_val[i]);
+	      --k;
+	    }
+	}
+      free (NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_val);
+      assert (k <= NIS_RES_OBJECT(res)->GR_data.gr_members.gr_members_len);
+      /* This realloc() call always decreases the size.  This cannot
+	 fail.  We still have the test but do not recover memory
+	 (i.e., we overwrite the input pointer).  */
+      newmem = realloc (newmem, k * sizeof (char*));
+      if (newmem == NULL)
+	return NIS_NOMEMORY;
 
-      /* There is no need to reallocate the gr_members_val array.  We
-	 just adjust the size to match the number of strings still in
-	 it.  Yes, xdr_array will use mem_free with a size parameter
-	 but this is mapped to a simple free call which determines the
-	 size of the block by itself.  */
-      NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_len = j;
+      NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_val = newmem;
+      NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_len = k;
 
       cp = stpcpy (buf, NIS_RES_OBJECT (res)->zo_name);
       *cp++ = '.';