diff options
| author | Jim Meyering <meyering@fb.com> | 2014-06-17 08:29:46 -0700 |
|---|---|---|
| committer | Jim Meyering <meyering@fb.com> | 2014-06-17 08:31:37 -0700 |
| commit | 831da41cbc76ecc67cdb0ca24c0f3b0f33181848 (patch) | |
| tree | 8b87f91fad79ebe1112d521b4a571955b7c383a9 | |
| parent | ecc31417bea430ede6afd3781cec49c04c184c04 (diff) | |
| download | gnulib-831da41cbc76ecc67cdb0ca24c0f3b0f33181848.tar.gz | |
parse-duration: eliminate 68-year duration limit
* lib/parse-duration.c: Include "intprops.h".
(TIME_MAX): Rename to MAX_DURATION and define to
TYPE_MAXIMUM(time_t).
* modules/parse-duration (Depends-on): Add intprops.
Reported by Jonas 'Sortie' Termansen.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | lib/parse-duration.c | 9 | ||||
| -rw-r--r-- | modules/parse-duration | 1 |
3 files changed, 17 insertions, 3 deletions
@@ -1,3 +1,13 @@ +2014-06-11 Bruce Korb <bkorb@gnu.org> + Jim Meyering <meyering@fb.com> + + parse-duration: eliminate 68-year duration limit + * lib/parse-duration.c: Include "intprops.h". + (TIME_MAX): Rename to MAX_DURATION and define to + TYPE_MAXIMUM(time_t). + * modules/parse-duration (Depends-on): Add intprops. + Reported by Jonas 'Sortie' Termansen. + 2014-06-14 Paul Eggert <eggert@cs.ucla.edu> pthread: don't assume AC_CANONICAL_HOST, port better to Solaris, etc. diff --git a/lib/parse-duration.c b/lib/parse-duration.c index 037e81e412..82a11938ee 100644 --- a/lib/parse-duration.c +++ b/lib/parse-duration.c @@ -27,6 +27,8 @@ #include <stdlib.h> #include <string.h> +#include "intprops.h" + #ifndef NUL #define NUL '\0' #endif @@ -51,7 +53,8 @@ typedef enum { #define SEC_PER_MONTH (SEC_PER_DAY * 30) #define SEC_PER_YEAR (SEC_PER_DAY * 365) -#define TIME_MAX 0x7FFFFFFF +#undef MAX_DURATION +#define MAX_DURATION TYPE_MAXIMUM(time_t) /* Wrapper around strtoul that does not require a cast. */ static unsigned long @@ -80,14 +83,14 @@ scale_n_add (time_t base, time_t val, int scale) return BAD_TIME; } - if (val > TIME_MAX / scale) + if (val > MAX_DURATION / scale) { errno = ERANGE; return BAD_TIME; } val *= scale; - if (base > TIME_MAX - val) + if (base > MAX_DURATION - val) { errno = ERANGE; return BAD_TIME; diff --git a/modules/parse-duration b/modules/parse-duration index 46288c0e13..6184dc4315 100644 --- a/modules/parse-duration +++ b/modules/parse-duration @@ -6,6 +6,7 @@ lib/parse-duration.h lib/parse-duration.c Depends-on: +intprops configure.ac: |