From d652f6b8cb5e2236c049a2b68214be8ce6a25d57 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 7 Jun 2001 03:35:22 +0000 Subject: 2001-06-06 Roland McGrath * sysdeps/mach/hurd/getsockopt.c: Fix handling of returned buffer size. From Robert Bihlmeyer . --- sysdeps/mach/hurd/getsockopt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sysdeps/mach/hurd/getsockopt.c') diff --git a/sysdeps/mach/hurd/getsockopt.c b/sysdeps/mach/hurd/getsockopt.c index 36403543df..dec356eb10 100644 --- a/sysdeps/mach/hurd/getsockopt.c +++ b/sysdeps/mach/hurd/getsockopt.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1994, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1992,94,97,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -45,10 +45,10 @@ getsockopt (fd, level, optname, optval, optlen) &buf, &buflen))) return __hurd_dfail (fd, err); + if (*optlen > buflen) + *optlen = buflen; if (buf != optval) { - if (*optlen < buflen) - *optlen = buflen; memcpy (optval, buf, *optlen); __vm_deallocate (__mach_task_self (), (vm_address_t) buf, buflen); } -- cgit v1.2.1