From 86d364ccd1c6f478c0774d9128efb2b2055be3c4 Mon Sep 17 00:00:00 2001 From: dannysmith Date: Wed, 21 May 2003 00:51:24 +0000 Subject: [PATCH 1/1] * libmath/stubs.c (hypot, hypotf, hypotl): Don't divide by zero. Update copyright year. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@67051 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/libmath/stubs.c | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 356a299850b..8ff83f7b005 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2003-05-21 Danny Smith + + * libmath/stubs.c (hypot, hypotf, hypotl): Don't divide by + zero. + Update copyright year. + 2003-05-20 Paolo Carlini * testsuite/27_io/basic_filebuf/close/char/4.cc: Fix typo. diff --git a/libstdc++-v3/libmath/stubs.c b/libstdc++-v3/libmath/stubs.c index 586fd6db80e..1968bffe7f9 100644 --- a/libstdc++-v3/libmath/stubs.c +++ b/libstdc++-v3/libmath/stubs.c @@ -1,6 +1,6 @@ /* Stub definitions for libmath subpart of libstdc++. */ -/* Copyright (C) 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU ISO C++ Library. This library is free software; you can redistribute it and/or modify it under the @@ -108,6 +108,8 @@ float hypotf(float x, float y) { float s = fabsf(x) + fabsf(y); + if (s == 0.0F) + return s; x /= s; y /= s; return s * sqrtf(x * x + y * y); } @@ -118,6 +120,8 @@ double hypot(double x, double y) { double s = fabs(x) + fabs(y); + if (s == 0.0) + return s; x /= s; y /= s; return s * sqrt(x * x + y * y); } @@ -128,6 +132,8 @@ long double hypotl(long double x, long double y) { long double s = fabsl(x) + fabsl(y); + if (s == 0.0L) + return s; x /= s; y /= s; return s * sqrtl(x * x + y * y); } -- 2.11.0