From 16356a81d27060b28d69ce331df569691471c97c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 21 Jan 2009 23:55:58 +0100 Subject: [PATCH] Improve error checking of c_strtod call. --- ChangeLog | 5 +++++ lib/getloadavg.c | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5dd2451da..a6e5634d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-01-21 Bruno Haible + * lib/getloadavg.c (getloadavg): Check c_strtod result against error + conditions other than overflow. + +2009-01-21 Bruno Haible + * lib/c-strtod.c: Include errno.h. (C_STRTOD): Check against NULL return from newlocale. Preserve errno value from STRTOD_L and STRTOD. diff --git a/lib/getloadavg.c b/lib/getloadavg.c index 5c32f9f9c..5a4005cee 100644 --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -1,8 +1,8 @@ /* Get the system load averages. Copyright (C) 1985, 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994, - 1995, 1997, 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2008 Free Software - Foundation, Inc. + 1995, 1997, 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free + Software Foundation, Inc. NOTE: The canonical source of this file is maintained with gnulib. Bugs can be reported to bug-gnulib@gnu.org. @@ -621,8 +621,11 @@ getloadavg (double loadavg[], int nelem) for (elem = 0; elem < nelem; elem++) { char *endptr; - double d = c_strtod (ptr, &endptr); - if (ptr == endptr) + double d; + + errno = 0; + d = c_strtod (ptr, &endptr); + if (ptr == endptr || (d == 0 && errno != 0)) { if (elem == 0) return -1; -- 2.11.0