From: Sergey Kandaurov Date: Wed, 7 Jun 2017 15:46:35 +0000 (+0300) Subject: Fixed segfault in try_files with nested location. X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=b0de3d70130658436afba69d07d68712834deccb;p=nginx.git Fixed segfault in try_files with nested location. If memory allocation of a new r->uri.data storage failed, reset its length as well. Request URI is used in ngx_http_finalize_request() for debug logging. --- diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 7e40e7860..b5be1ffeb 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -1353,6 +1353,7 @@ ngx_http_core_try_files_phase(ngx_http_request_t *r, r->uri.len = alias + path.len; r->uri.data = ngx_pnalloc(r->pool, r->uri.len); if (r->uri.data == NULL) { + r->uri.len = 0; ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); return NGX_OK; }