diff options
author | Maxim Dounin <mdounin@mdounin.ru> | 2017-09-13 15:53:19 +0300 |
---|---|---|
committer | Maxim Dounin <mdounin@mdounin.ru> | 2017-09-13 15:53:19 +0300 |
commit | b900cc28fcbb4cf5a32ab62f80b59292e1c85b4b (patch) | |
tree | d8fa899d15e44c038edb9eaa17fddc3834d93665 /src | |
parent | 0206ebe76f748bb39d9de4dd4b3fce777fdfdccf (diff) | |
download | nginx-b900cc28fcbb4cf5a32ab62f80b59292e1c85b4b.tar.gz nginx-b900cc28fcbb4cf5a32ab62f80b59292e1c85b4b.zip |
Introduced time truncation to December 31, 9999 (ticket #1368).
Various buffers are allocated in an assumption that there would be
no more than 4 year digits. This might not be true on platforms
with 64-bit time_t, as 64-bit time_t is able to represent more than that.
Such dates with more than 4 year digits hardly make sense though, as
various date formats in use do not allow them anyway.
As such, all dates are now truncated by ngx_gmtime() to December 31, 9999.
This should have no effect on valid dates, though will prevent potential
buffer overflows on invalid ones.
Diffstat (limited to 'src')
-rw-r--r-- | src/core/ngx_times.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/core/ngx_times.c b/src/core/ngx_times.c index ef63f1e3d..b2edf1a5f 100644 --- a/src/core/ngx_times.c +++ b/src/core/ngx_times.c @@ -311,6 +311,16 @@ ngx_gmtime(time_t t, ngx_tm_t *tp) days = t / 86400; sec = t % 86400; + /* + * no more than 4 year digits supported, + * truncate to December 31, 9999, 23:59:59 + */ + + if (days > 2932896) { + days = 2932896; + sec = 86399; + } + /* January 1, 1970 was Thursday */ wday = (4 + days) % 7; |