OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[BZ #7080] 

2008-12-08  Ulrich Drepper  <drepper@redhat.com>
	[BZ #7080]
	* inet/getnameinfo.c (getnameinfo): Check for output buffers being
	NULL when NI_NAMEREQD is set.
	Patch mostly by Yang Hongyang <yanghy@cn.fujitsu.com>.
	* inet/Makefile (tests): Add tst-getni1.
	* inet/tst-getni1.c: New file.
This commit is contained in:
Ulrich Drepper 2008-12-09 10:02:20 +00:00
parent cd72adebda
commit d4f0720b20
4 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2008-12-08 Ulrich Drepper <drepper@redhat.com>
[BZ #7080]
* inet/getnameinfo.c (getnameinfo): Check for output buffers being
NULL when NI_NAMEREQD is set.
Patch mostly by Yang Hongyang <yanghy@cn.fujitsu.com>.
* inet/Makefile (tests): Add tst-getni1.
* inet/tst-getni1.c: New file.
2008-12-03 Petr Baudis <pasky@suse.cz>
[BZ #7067]

3
inet/Makefile
View File

@ -52,7 +52,8 @@ routines := htonl htons \
aux := check_pf check_native ifreq
tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
tst-gethnm test-ifaddrs bug-if1 test-inet6_opt tst-ether_line
tst-gethnm test-ifaddrs bug-if1 test-inet6_opt tst-ether_line \
tst-getni1
include ../Rules

3
inet/getnameinfo.c
View File

@ -178,6 +178,9 @@ getnameinfo (const struct sockaddr *sa, socklen_t addrlen, char *host,
if (sa == NULL || addrlen < sizeof (sa_family_t))
return EAI_FAMILY;
if ((flags & NI_NAMEREQD) && host == NULL && serv == NULL)
return EAI_NONAME;
switch (sa->sa_family)
{
case AF_LOCAL:

36
inet/tst-getni1.c Normal file
View File

@ -0,0 +1,36 @@
#include <netdb.h>
#include <stdio.h>
#include <sys/socket.h>
static int
do_test (void)
{
int retval = 0;
struct sockaddr_in s;
s.sin_family = AF_INET;
s.sin_port = 80;
s.sin_addr.s_addr = INADDR_LOOPBACK;
int r = getnameinfo((struct sockaddr *) &s, sizeof (s), NULL, 0, NULL, 0,
NI_NUMERICHOST | NI_NUMERICSERV);
printf("r = %d\n", r);
if (r != 0)
{
puts ("failed without NI_NAMEREQD");
retval = 1;
}
r = getnameinfo((struct sockaddr *) &s, sizeof (s), NULL, 0, NULL, 0,
NI_NUMERICHOST | NI_NUMERICSERV | NI_NAMEREQD);
printf("r = %d\n", r);
if (r != EAI_NONAME)
{
puts ("did not fail with EAI_NONAME with NI_NAMEREQD set");
retval = 1;
}
return retval;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"