[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>.
git-mirror · Oct 23, 2005 · 2ba7a64 · 2ba7a64
1 parent d8f5ccd
commit 2ba7a64
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git 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
@@ -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;
 }