diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-08-24 12:06:55 -0700 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-08-24 12:06:55 -0700 |
| commit | f0c281e072fd324261a51558284c04e230c0178d (patch) | |
| tree | 1934177724689ef72853bdb7490648034eef7cb1 /math | |
| parent | 7b943af6cf2bfd4b94be271877a10128c32d03da (diff) | |
| download | glibc-f0c281e072fd324261a51558284c04e230c0178d.tar.gz glibc-f0c281e072fd324261a51558284c04e230c0178d.tar.xz glibc-f0c281e072fd324261a51558284c04e230c0178d.zip | |
Fix overflow handling in fdim.
Diffstat (limited to 'math')
| -rw-r--r-- | math/s_fdim.c | 12 | ||||
| -rw-r--r-- | math/s_fdimf.c | 12 | ||||
| -rw-r--r-- | math/s_fdiml.c | 16 |
3 files changed, 32 insertions, 8 deletions
diff --git a/math/s_fdim.c b/math/s_fdim.c index 5804e631c3..677fdcde1a 100644 --- a/math/s_fdim.c +++ b/math/s_fdim.c @@ -1,5 +1,5 @@ /* 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. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -18,6 +18,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <errno.h> #include <math.h> double @@ -31,7 +32,14 @@ __fdim (double x, double y) /* Raise invalid flag. */ 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) #ifdef NO_LONG_DOUBLE diff --git a/math/s_fdimf.c b/math/s_fdimf.c index 2f3ce303ae..737413a5f4 100644 --- a/math/s_fdimf.c +++ b/math/s_fdimf.c @@ -1,5 +1,5 @@ /* 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. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -18,6 +18,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <errno.h> #include <math.h> float @@ -31,6 +32,13 @@ __fdimf (float x, float y) /* Raise invalid flag. */ 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) diff --git a/math/s_fdiml.c b/math/s_fdiml.c index 70246bafbd..e1ff11b307 100644 --- a/math/s_fdiml.c +++ b/math/s_fdiml.c @@ -1,5 +1,5 @@ /* 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. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -18,19 +18,27 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include <errno.h> #include <math.h> long double __fdiml (long double x, long double y) { - int clsx = fpclassify (x); - int clsy = fpclassify (y); + int clsx = fpclassifyl (x); + int clsy = fpclassifyl (y); if (clsx == FP_NAN || clsy == FP_NAN || (y < 0 && clsx == FP_INFINITE && clsy == FP_INFINITE)) /* Raise invalid flag. */ 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) |