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

* nis/nis_addmember.c (nis_addmember): Avoid unnecessary copying.

Browse Source 
Avoid memory leak in case realloc fails.  Simplification for
	better code generation.

	Avoid deprecation warning because of libc_hidden_proto for
	inet6_option_alloc.
	* inet/inet6_option.c (option_alloc): Renamed from
	inet6_option_alloc.  Made static.
	(inet6_option_alloc): New a simple wrapper around option_alloc.
	(inet6_option_append): Call option_alloc.
	* include/netinet/in.h: Remove libc_hidden_proto for
	inet6_option_alloc.
This commit is contained in:
Ulrich Drepper 2006-05-25 17:16:17 +00:00
parent 6bcb494a99
commit 1663b44fbc
4 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,5 +1,18 @@
2006-05-25 Ulrich Drepper <drepper@redhat.com>
* nis/nis_addmember.c (nis_addmember): Avoid unnecessary copying.
Avoid memory leak in case realloc fails. Simplification for
better code generation.
Avoid deprecation warning because of libc_hidden_proto for
inet6_option_alloc.
* inet/inet6_option.c (option_alloc): Renamed from
inet6_option_alloc. Made static.
(inet6_option_alloc): New a simple wrapper around option_alloc.
(inet6_option_append): Call option_alloc.
* include/netinet/in.h: Remove libc_hidden_proto for
inet6_option_alloc.
* nis/nis_callback.c (__nis_create_callback): Always call xdr_free
for cleanup when cb!=NULL [Coverity CID 233].

1
include/netinet/in.h
View File

@ -5,6 +5,5 @@
libc_hidden_proto (bindresvport)
libc_hidden_proto (in6addr_loopback)
libc_hidden_proto (in6addr_any)
libc_hidden_proto (inet6_option_alloc)
#endif

26
inet/inet6_option.c
View File

@ -75,6 +75,10 @@ get_opt_end (const uint8_t **result, const uint8_t *startp,
}
static uint8_t *option_alloc (struct cmsghdr *cmsg, int datalen, int multx,
int plusy);
/* RFC 2292, 6.3.1
This function returns the number of bytes required to hold an option
@ -150,7 +154,7 @@ inet6_option_append (cmsg, typep, multx, plusy)
int len = typep[0] == IP6OPT_PAD1 ? 1 : typep[1] + 2;
/* Get the pointer to the space in the message. */
uint8_t *ptr = inet6_option_alloc (cmsg, len, multx, plusy);
uint8_t *ptr = option_alloc (cmsg, len, multx, plusy);
if (ptr == NULL)
/* Some problem with the parameters. */
return -1;
@ -169,12 +173,8 @@ inet6_option_append (cmsg, typep, multx, plusy)
inet6_option_init(). This function returns a pointer to the 8-bit
option type field that starts the option on success, or NULL on an
error. */
uint8_t *
inet6_option_alloc (cmsg, datalen, multx, plusy)
struct cmsghdr *cmsg;
int datalen;
int multx;
int plusy;
static uint8_t *
option_alloc (struct cmsghdr *cmsg, int datalen, int multx, int plusy)
{
/* The RFC limits the value of the alignment values. */
if ((multx != 1 && multx != 2 && multx != 4 && multx != 8)
@ -214,7 +214,17 @@ inet6_option_alloc (cmsg, datalen, multx, plusy)
return result;
}
libc_hidden_def (inet6_option_alloc)
uint8_t *
inet6_option_alloc (cmsg, datalen, multx, plusy)
struct cmsghdr *cmsg;
int datalen;
int multx;
int plusy;
{
return option_alloc (cmsg, datalen, multx, plusy);
}
/* RFC 2292, 6.3.5

28
nis/nis_addmember.c
View File

@ -1,4 +1,4 @@
/* Copyright (c) 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
/* Copyright (c) 1997, 1998, 1999, 2004, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
@ -28,13 +28,12 @@ nis_addmember (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_result *res, *res2;
nis_error status;
char *cp, *cp2;
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");
cp2 = nis_domain_of_r (group, domainbuf, sizeof (domainbuf) - 1);
if (cp2 != NULL && cp2[0] != '\0')
@ -49,23 +48,28 @@ nis_addmember (const_nis_name member, const_nis_name group)
nis_freeresult (res);
return status;
}
if ((NIS_RES_NUMOBJ (res) != 1) ||
(__type_of (NIS_RES_OBJECT (res)) != NIS_GROUP_OBJ))
if (NIS_RES_NUMOBJ (res) != 1
|| __type_of (NIS_RES_OBJECT (res)) != NIS_GROUP_OBJ)
{
nis_freeresult (res);
return NIS_INVALIDOBJ;
}
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;
nis_name *new_gr_members_val
= realloc (NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_val,
(NIS_RES_OBJECT(res)->GR_data.gr_members.gr_members_len + 1)
* sizeof (char *));
if (NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_val == NULL)
(gr_members_len + 1) * sizeof (nis_name));
if (new_gr_members_val == NULL)
goto nomem_out;
NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_val[NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_len] = strdup (member);
if (NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_val[NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_len] == NULL)
NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_val
= new_gr_members_val;
new_gr_members_val[gr_members_len] = strdup (member);
if (new_gr_members_val[gr_members_len] == NULL)
{
free (NIS_RES_OBJECT (res)->GR_data.gr_members.gr_members_val);
nomem_out:
nis_freeresult (res);
return NIS_NOMEMORY;