commit 3f6c21e3648c6db3bddaeb00d45f686f7baa4cc9
author Maxim Dounin <mdounin@mdounin.ru> Fri Oct 30 21:43:30 2015 +0300
committer Maxim Dounin <mdounin@mdounin.ru> Fri Oct 30 21:43:30 2015 +0300
tree c3c3ef6aae2ead19684511c011be677779c3bc59
parent 73f085f44e10aec642602a7383ea2d13eb15305d

Fixed ngx_parse_time() out of bounds access (ticket #821).

The code failed to ensure that "s" is within the buffer passed for
parsing when checking for "ms", and this resulted in unexpected errors when
parsing non-null-terminated strings with trailing "m".  The bug manifested
itself when the expires directive was used with variables.

Found by Roman Arutyunyan.

src/core/ngx_parse.c

diff --git a/src/core/ngx_parse.c b/src/core/ngx_parse.c
index d7350d4..7b60c5f 100644
--- a/src/core/ngx_parse.c
+++ b/src/core/ngx_parse.c
@@ -188,7 +188,7 @@
             break;
 
         case 'm':
-            if (*p == 's') {
+            if (p < last && *p == 's') {
                 if (is_sec || step >= st_msec) {
                     return NGX_ERROR;
                 }