mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-21 12:30:06 +00:00
BZ#14317: Optimze __xpg_strerror_r
[BZ #14317] * string/xpg-strerror.c (__xpg_strerror_r): Optimize, call strlen only if needed.
This commit is contained in:
parent
9c7595bda2
commit
7fffbdfff7
@ -1,3 +1,9 @@
|
||||
2012-12-27 Bruno Haible <bruno@clisp.org>
|
||||
|
||||
[BZ #14317]
|
||||
* string/xpg-strerror.c (__xpg_strerror_r): Optimize, call strlen
|
||||
only if needed.
|
||||
|
||||
2012-12-27 Siddhesh Poyarekar <siddhesh@redhat.com>
|
||||
|
||||
* sysdeps/ieee754/dbl-64/mpexp.c (__mpexp): Eliminate __mpexp_nn
|
||||
|
2
NEWS
2
NEWS
@ -9,6 +9,8 @@ Version 2.18
|
||||
|
||||
* The following bugs are resolved with this release:
|
||||
|
||||
14317.
|
||||
|
||||
|
||||
Version 2.17
|
||||
|
||||
|
@ -1,5 +1,4 @@
|
||||
/* Copyright (C) 1991, 1993, 1995-1998, 2000, 2002, 2004, 2010, 2011
|
||||
Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1991-2012 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
|
||||
@ -28,20 +27,27 @@ int
|
||||
__xpg_strerror_r (int errnum, char *buf, size_t buflen)
|
||||
{
|
||||
const char *estr = __strerror_r (errnum, buf, buflen);
|
||||
size_t estrlen = strlen (estr);
|
||||
|
||||
/* We know that __strerror_r returns buf (with a dynamically computed
|
||||
string) if errnum is invalid, otherwise it returns a string whose
|
||||
storage has indefinite extent. */
|
||||
if (estr == buf)
|
||||
{
|
||||
assert (errnum < 0 || errnum >= _sys_nerr_internal
|
||||
|| _sys_errlist_internal[errnum] == NULL);
|
||||
return EINVAL;
|
||||
}
|
||||
assert (errnum >= 0 && errnum < _sys_nerr_internal
|
||||
&& _sys_errlist_internal[errnum] != NULL);
|
||||
else
|
||||
{
|
||||
assert (errnum >= 0 && errnum < _sys_nerr_internal
|
||||
&& _sys_errlist_internal[errnum] != NULL);
|
||||
|
||||
/* Terminate the string in any case. */
|
||||
if (buflen > 0)
|
||||
*((char *) __mempcpy (buf, estr, MIN (buflen - 1, estrlen))) = '\0';
|
||||
size_t estrlen = strlen (estr);
|
||||
|
||||
return buflen <= estrlen ? ERANGE : 0;
|
||||
/* Terminate the string in any case. */
|
||||
if (buflen > 0)
|
||||
*((char *) __mempcpy (buf, estr, MIN (buflen - 1, estrlen))) = '\0';
|
||||
|
||||
return buflen <= estrlen ? ERANGE : 0;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user