From 7ea72f99966a65a56aedba817ee2413ff9b1f23c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 21 May 2011 12:11:36 -0400 Subject: Always fill output buffer in XPG strerror function --- string/xpg-strerror.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'string') diff --git a/string/xpg-strerror.c b/string/xpg-strerror.c index 8d898122d1..00256c3dac 100644 --- a/string/xpg-strerror.c +++ b/string/xpg-strerror.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1995, 1996, 1997, 1998, 2000, 2002, 2004, 2010 +/* Copyright (C) 1991, 1993, 1995-1998, 2000, 2002, 2004, 2010, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -17,6 +17,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include #include #include #include @@ -37,16 +38,16 @@ int __xpg_strerror_r (int errnum, char *buf, size_t buflen) { + const char *estr = __strerror_r (errnum, buf, buflen); + size_t estrlen = strlen (estr); + if (errnum < 0 || errnum >= _sys_nerr_internal || _sys_errlist_internal[errnum] == NULL) return EINVAL; - const char *estr = (const char *) _(_sys_errlist_internal[errnum]); - size_t estrlen = strlen (estr) + 1; - - if (buflen < estrlen) - return ERANGE; + assert (estr != buf); +/* Terminate the string in any case. */ + *((char *) __mempcpy (buf, estr, MIN (buflen - 1, estrlen))) = '\0'; - memcpy (buf, estr, estrlen); - return 0; + return buflen <= estrlen ? ERANGE : 0; } -- cgit 1.4.1