AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-23 03:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix overflow handling in fdim.

Browse Source
This commit is contained in:
Ulrich Drepper 2009-08-24 12:06:55 -07:00
parent 7b943af6cf
commit f0c281e072
4 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2009-08-24 Ulrich Drepper <drepper@redhat.com> 2009-08-24 Ulrich Drepper <drepper@redhat.com>
* math/s_fdim.c: In case of overflows set errno.
* math/s_fdimf.c: Likewise.
* math/s_fdiml.c: Likewise.
* math/math.h: Define math_errhandling of __FAST_MATH__ is not defined. * math/math.h: Define math_errhandling of __FAST_MATH__ is not defined.
* sysdeps/i386/fpu/bits/mathinline.h: Undefine math_errhandling if we * sysdeps/i386/fpu/bits/mathinline.h: Undefine math_errhandling if we
are using the inline optimizations. are using the inline optimizations.

12
math/s_fdim.c
View File

@ -1,5 +1,5 @@
/* Return positive difference between arguments. /* Return positive difference between arguments.
Copyright (C) 1997, 2004 Free Software Foundation, Inc. Copyright (C) 1997, 2004, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@ -18,6 +18,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
#include <errno.h>
#include <math.h> #include <math.h>
double double
@ -31,7 +32,14 @@ __fdim (double x, double y)
/* Raise invalid flag. */ /* Raise invalid flag. */
return x - y; return x - y;
return x <= y ? 0 : x - y; if (x <= y)
return 0.0;
double r = x - y;
if (fpclassify (r) == FP_INFINITE)
__set_errno (ERANGE);
return r;
} }
weak_alias (__fdim, fdim) weak_alias (__fdim, fdim)
#ifdef NO_LONG_DOUBLE #ifdef NO_LONG_DOUBLE

12
math/s_fdimf.c
View File

@ -1,5 +1,5 @@
/* Return positive difference between arguments. /* Return positive difference between arguments.
Copyright (C) 1997, 2004 Free Software Foundation, Inc. Copyright (C) 1997, 2004, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@ -18,6 +18,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
#include <errno.h>
#include <math.h> #include <math.h>
float float
@ -31,6 +32,13 @@ __fdimf (float x, float y)
/* Raise invalid flag. */ /* Raise invalid flag. */
return x - y; return x - y;
return x <= y ? 0 : x - y; if (x <= y)
return 0.0f;
float r = x - y;
if (fpclassify (r) == FP_INFINITE)
__set_errno (ERANGE);
return r;
} }
weak_alias (__fdimf, fdimf) weak_alias (__fdimf, fdimf)

16
math/s_fdiml.c
View File

@ -1,5 +1,5 @@
/* Return positive difference between arguments. /* Return positive difference between arguments.
Copyright (C) 1997, 2004 Free Software Foundation, Inc. Copyright (C) 1997, 2004, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@ -18,19 +18,27 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
#include <errno.h>
#include <math.h> #include <math.h>
long double long double
__fdiml (long double x, long double y) __fdiml (long double x, long double y)
{ {
int clsx = fpclassify (x); int clsx = fpclassifyl (x);
int clsy = fpclassify (y); int clsy = fpclassifyl (y);
if (clsx == FP_NAN || clsy == FP_NAN if (clsx == FP_NAN || clsy == FP_NAN
|| (y < 0 && clsx == FP_INFINITE && clsy == FP_INFINITE)) || (y < 0 && clsx == FP_INFINITE && clsy == FP_INFINITE))
/* Raise invalid flag. */ /* Raise invalid flag. */
return x - y; return x - y;
return x <= y ? 0 : x - y; if (x <= y)
return 0.0f;
long double r = x - y;
if (fpclassify (r) == FP_INFINITE)
__set_errno (ERANGE);
return r;
} }
weak_alias (__fdiml, fdiml) weak_alias (__fdiml, fdiml)