diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-12-12 16:58:13 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-12-12 16:58:13 +0000 |
| commit | 8b8c017d058ca0fbf06c910341117df5394834a9 (patch) | |
| tree | 5770efd388b69e1029f8c9db72bb82380e900746 /src | |
| parent | f2d00ec64fe336164dd96b9c6729ad5d72324808 (diff) | |
| download | nginx-8b8c017d058ca0fbf06c910341117df5394834a9.tar.gz nginx-8b8c017d058ca0fbf06c910341117df5394834a9.tar.bz2 | |
r1567 merge:
fix segfault when $date_local or $date_gmt are used outside ssi module
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/modules/ngx_http_ssi_filter_module.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/http/modules/ngx_http_ssi_filter_module.c b/src/http/modules/ngx_http_ssi_filter_module.c index 8a05dfd4e..60aed18f8 100644 --- a/src/http/modules/ngx_http_ssi_filter_module.c +++ b/src/http/modules/ngx_http_ssi_filter_module.c @@ -2648,8 +2648,9 @@ ngx_http_ssi_date_gmt_local_variable(ngx_http_request_t *r, ctx = ngx_http_get_module_ctx(r, ngx_http_ssi_filter_module); - if (ctx->timefmt.len == sizeof("%s") - 1 - && ctx->timefmt.data[0] == '%' && ctx->timefmt.data[1] == 's') + if (ctx == NULL + || (ctx->timefmt.len == sizeof("%s") - 1 + && ctx->timefmt.data[0] == '%' && ctx->timefmt.data[1] == 's')) { v->data = ngx_palloc(r->pool, NGX_TIME_T_LEN); if (v->data == NULL) { |