From: Roland McGrath <roland@gnu.org>
Date: Thu, 7 Jun 2001 03:35:22 +0000 (+0000)
Subject: 2001-06-06  Roland McGrath  <roland@frob.com>
X-Git-Tag: cvs/pre-lgplv2_1~103
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d652f6b8cb5e2236c049a2b68214be8ce6a25d57;p=thirdparty%2Fglibc.git

2001-06-06  Roland McGrath  <roland@frob.com>

	* sysdeps/mach/hurd/getsockopt.c: Fix handling of returned buffer size.
	From Robert Bihlmeyer <robbe@orcus.priv.at>.
---

diff --git a/sysdeps/mach/hurd/getsockopt.c b/sysdeps/mach/hurd/getsockopt.c
index 36403543df9..dec356eb10d 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);
     }