AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-05 09:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

* nis/nis_removemember.c (nis_removemember): Avoid unnecessary

Browse Source 
coping.  No need to allocate new array for group members.  Just
	move the pointers and update the size.
This commit is contained in:
Ulrich Drepper 2006-05-25 18:31:29 +00:00
parent 1663b44fbc
commit 672d5a63a9
2 changed files with 29 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2006-05-25 Ulrich Drepper <drepper@redhat.com> 2006-05-25 Ulrich Drepper <drepper@redhat.com>
* nis/nis_removemember.c (nis_removemember): Avoid unnecessary
coping. No need to allocate new array for group members. Just
move the pointers and update the size.
* nis/nis_addmember.c (nis_addmember): Avoid unnecessary copying. * nis/nis_addmember.c (nis_addmember): Avoid unnecessary copying.
Avoid memory leak in case realloc fails. Simplification for Avoid memory leak in case realloc fails. Simplification for
better code generation. better code generation.

72
nis/nis_removemember.c
View File

@ -28,15 +28,12 @@ nis_removemember (const_nis_name member, const_nis_name group)
{ {
size_t grouplen = strlen (group); size_t grouplen = strlen (group);
char buf[grouplen + 14 + NIS_MAXNAMELEN]; char buf[grouplen + 14 + NIS_MAXNAMELEN];
char leafbuf[grouplen + 2];
char domainbuf[grouplen + 2]; char domainbuf[grouplen + 2];
nis_name *newmem;
nis_result *res, *res2; nis_result *res, *res2;
nis_error status; nis_error status;
char *cp, *cp2; char *cp, *cp2;
unsigned long int i, j, k;
cp = stpcpy (buf, nis_leaf_of_r (group, leafbuf, sizeof (leafbuf) - 1)); cp = rawmemchr (nis_leaf_of_r (group, buf, sizeof (buf) - 1), '\0');
cp = stpcpy (cp, ".groups_dir"); cp = stpcpy (cp, ".groups_dir");
cp2 = nis_domain_of_r (group, domainbuf, sizeof (domainbuf) - 1); cp2 = nis_domain_of_r (group, domainbuf, sizeof (domainbuf) - 1);
if (cp2 != NULL && cp2[0] != '\0') if (cp2 != NULL && cp2[0] != '\0')
@ -45,67 +42,40 @@ nis_removemember (const_nis_name member, const_nis_name group)
stpcpy (cp, cp2); stpcpy (cp, cp2);
} }
res = nis_lookup (buf, FOLLOW_LINKS | EXPAND_NAME); res = nis_lookup (buf, FOLLOW_LINKS | EXPAND_NAME);
if (res == NULL || NIS_RES_STATUS (res) != NIS_SUCCESS) if (res == NULL)
{ return NIS_NOMEMORY;
if (res) if (NIS_RES_STATUS (res) != NIS_SUCCESS)
{ {
status = NIS_RES_STATUS (res); status = NIS_RES_STATUS (res);
nis_freeresult (res); nis_freeresult (res);
}
else
return NIS_NOMEMORY;
return status; return status;
} }
if ((res->objects.objects_len != 1) || if (NIS_RES_NUMOBJ (res) != 1
(__type_of (NIS_RES_OBJECT (res)) != NIS_GROUP_OBJ)) || __type_of (NIS_RES_OBJECT (res)) != NIS_GROUP_OBJ)
{ {
nis_freeresult (res); nis_freeresult (res);
return NIS_INVALIDOBJ; return NIS_INVALIDOBJ;
} }
newmem = nis_name *gr_members_val
calloc (NIS_RES_OBJECT(res)->GR_data.gr_members.gr_members_len, = NIS_RES_OBJECT(res)->GR_data.gr_members.gr_members_val;
sizeof (char *)); u_int gr_members_len
if (newmem == NULL) = NIS_RES_OBJECT(res)->GR_data.gr_members.gr_members_len;
{
nis_freeresult (res);
return NIS_NOMEMORY;
}
k = NIS_RES_OBJECT (res)[0].GR_data.gr_members.gr_members_len; u_int j = 0;
j = 0; for (u_int i = 0; i < gr_members_len; ++i)
for (i = 0; i < NIS_RES_OBJECT(res)->GR_data.gr_members.gr_members_len; if (strcmp (gr_members_val[i], member) != 0)
++i) gr_members_val[j++] = gr_members_val[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 else
{ free (gr_members_val[i]);
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). */
nis_name *newp = realloc (newmem, k * sizeof (char*));
if (newp == NULL)
{
free (newmem);
nis_freeresult (res);
return NIS_NOMEMORY;
}
newmem = newp;
NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_val = newmem; /* There is no need to reallocate the gr_members_val array. We
NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_len = k; 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;
cp = stpcpy (buf, NIS_RES_OBJECT (res)->zo_name); cp = stpcpy (buf, NIS_RES_OBJECT (res)->zo_name);
*cp++ = '.'; *cp++ = '.';