summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-10-23 00:46:40 +0000
committerRoland McGrath <roland@gnu.org>2005-10-23 00:46:40 +0000
commit2ba7a64cb93891e00729adff2a3f4674f1c23c78 (patch)
tree44070e6c0c327be35e4955aed0ff9e65757e44fd
parentd8f5ccdde75ced2f5b7fe93dd9ef6ba58772b128 (diff)
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>.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/mach/hurd/getpeername.c13
2 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9084710539..fc322ff538 100644
--- 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 39071c1da4..325b6fd75d 100644
--- 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;
}