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

Hurd: recvfrom(): take into account null address ports

Browse Source
This commit is contained in:
Pino Toscano 2012-05-10 15:30:38 -07:00 committed by Roland McGrath
parent b29d4053f0
commit 37ed8b9bdc
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,7 +1,12 @@
2012-05-10 Pino Toscano <toscano.pino@tiscali.it>
* sysdeps/mach/hurd/recvfrom.c (__recvfrom): Check also for a null
address port. Set ADDR_LEN to 0 when not filling ADDRARG.
2012-05-10 Samuel Thibault <samuel.thibault@ens-lyon.org> 2012-05-10 Samuel Thibault <samuel.thibault@ens-lyon.org>
* sysdeps/mach/hurd/readlinkat.c: New file, heavily derived from * sysdeps/mach/hurd/readlinkat.c: New file, heavily derived from
sysdeps/mach/hurd/readlink.c. sysdeps/mach/hurd/readlink.c.
* posix/tst-sysconf.c (posix_options): Only use * posix/tst-sysconf.c (posix_options): Only use
_POSIX_PRIORITIZED_IO, _POSIX_PRIORITY_SCHEDULING, and _POSIX_PRIORITIZED_IO, _POSIX_PRIORITY_SCHEDULING, and

6
sysdeps/mach/hurd/recvfrom.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1994, 1997, 1999, 2001, 2002 Free Software Foundation, Inc. /* Copyright (C) 1994-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -54,7 +54,7 @@ __recvfrom (fd, buf, n, flags, addrarg, addr_len)
return __hurd_sockfail (fd, flags, err); return __hurd_sockfail (fd, flags, err);
/* Get address data for the returned address port if requested. */ /* Get address data for the returned address port if requested. */
if (addr != NULL) if (addr != NULL && addrport != MACH_PORT_NULL)
{ {
char *buf = (char *) addr; char *buf = (char *) addr;
mach_msg_type_number_t buflen = *addr_len; mach_msg_type_number_t buflen = *addr_len;
@ -88,6 +88,8 @@ __recvfrom (fd, buf, n, flags, addrarg, addr_len)
if (buflen > 0) if (buflen > 0)
addr->sa_family = type; addr->sa_family = type;
} }
else if (addr_len != NULL)
*addr_len = 0;
__mach_port_deallocate (__mach_task_self (), addrport); __mach_port_deallocate (__mach_task_self (), addrport);