[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>.

diff --git a/ChangeLog b/ChangeLog
index 9084710539f0a36e20e05c7477094d5779132257..fc322ff5389314cdd219953686e48015e6e3fa9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        [BZ #1252]

diff --git a/sysdeps/mach/hurd/getpeername.c b/sysdeps/mach/hurd/getpeername.c
index 39071c1da4dec1af92c439a65093b528abce368b..325b6fd75d50a33afb9ca13aa3b96efa6a949248 100644 (file)
--- a/sysdeps/mach/hurd/getpeername.c
+++ b/sysdeps/mach/hurd/getpeername.c
@@ -55,11 +55,14 @@ __getpeername (int fd, __SOCKADDR_ARG addrarg, socklen_t *len)
     }
 
   const sa_family_t family = type;
-  if (*len < (char *) (&addr->sa_family + 1) - (char *) addr)
-    memcpy (&addr->sa_family, &family,
-           *len - offsetof (struct sockaddr, sa_family));
-  else
-    addr->sa_family = family;
+  if (*len > offsetof (struct sockaddr, sa_family))
+    {
+      if (*len < (char *) (&addr->sa_family + 1) - (char *) addr)
+       memcpy (&addr->sa_family, &family,
+               *len - offsetof (struct sockaddr, sa_family));
+      else
+       addr->sa_family = family;
+    }
 
   return 0;
 }