diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2015-04-16 13:14:29 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-04-16 13:14:29 +0300 |
| commit | 2c30183a9c77b980b788ec1b52fe46ce34ed12c7 (patch) | |
| tree | f82fabd29a3a4f609bef13aa73faff3950da22a6 /builtin.c | |
| parent | 7466599b374694c1640faee1b6a0a4760fbe718a (diff) | |
| parent | 5d781d9d27f2ab30679853317df3f5e9ad94be80 (diff) | |
| download | egawk-2c30183a9c77b980b788ec1b52fe46ce34ed12c7.tar.gz egawk-2c30183a9c77b980b788ec1b52fe46ce34ed12c7.tar.bz2 egawk-2c30183a9c77b980b788ec1b52fe46ce34ed12c7.zip | |
Merge branch 'gawk-4.1-stable'
Diffstat (limited to 'builtin.c')
| -rw-r--r-- | builtin.c | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -1872,7 +1872,7 @@ do_strftime(int nargs) NODE *t1, *t2, *t3, *ret; struct tm *tm; time_t fclock; - long clock_val; + double clock_val; char *bufp; size_t buflen, bufsize; char buf[BUFSIZ]; @@ -1881,6 +1881,8 @@ do_strftime(int nargs) int do_gmt; NODE *val = NULL; NODE *sub = NULL; + static const time_t time_t_min = TYPE_MINIMUM(time_t); + static const time_t time_t_max = TYPE_MAXIMUM(time_t); /* set defaults first */ format = def_strftime_format; /* traditional date format */ @@ -1920,7 +1922,7 @@ do_strftime(int nargs) if (do_lint && (t2->flags & (NUMCUR|NUMBER)) == 0) lintwarn(_("strftime: received non-numeric second argument")); (void) force_number(t2); - clock_val = get_number_si(t2); + clock_val = get_number_d(t2); fclock = (time_t) clock_val; /* * 4/2015: Protect against negative value being assigned @@ -1928,6 +1930,11 @@ do_strftime(int nargs) */ if (clock_val < 0 && fclock > 0) fatal(_("strftime: second argument less than 0 or too big for time_t")); + + /* And check that the value is in range */ + if (clock_val < time_t_min || clock_val > time_t_max) + fatal(_("strftime: second argument out of range for time_t")); + DEREF(t2); } |