qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BZ #1254] 

2005-10-22  Roland McGrath  <roland@redhat.com>
	[BZ #1254]
	* sysdeps/mach/hurd/getpeername.c (__getpeername): Fix last change.
	From Samuel Thibault <samuel.thibault@ens-lyon.org>.
This commit is contained in:
Roland McGrath 2005-10-23 00:46:40 +00:00
parent d8f5ccdde7
commit 2ba7a64cb9
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2005-10-22 Roland McGrath <roland@redhat.com>
[BZ #1254]
* sysdeps/mach/hurd/getpeername.c (__getpeername): Fix last change.
From Samuel Thibault <samuel.thibault@ens-lyon.org>.
2005-10-17 Thomas Schwinge <tschwinge@gnu.org> 2005-10-17 Thomas Schwinge <tschwinge@gnu.org>
[BZ #1252] [BZ #1252]

3
sysdeps/mach/hurd/getpeername.c
View File

@ -55,11 +55,14 @@ __getpeername (int fd, __SOCKADDR_ARG addrarg, socklen_t *len)
} }
const sa_family_t family = type; const sa_family_t family = type;
if (*len > offsetof (struct sockaddr, sa_family))
{
if (*len < (char *) (&addr->sa_family + 1) - (char *) addr) if (*len < (char *) (&addr->sa_family + 1) - (char *) addr)
memcpy (&addr->sa_family, &family, memcpy (&addr->sa_family, &family,
*len - offsetof (struct sockaddr, sa_family)); *len - offsetof (struct sockaddr, sa_family));
else else
addr->sa_family = family; addr->sa_family = family;
}
return 0; return 0;
} }