# HG changeset patch # User Igor Sysoev # Date 1171022183 0 # Node ID df8cdf626c879e0ed3154079f7c1a2315cddc455 # Parent 57db008a70cee9bf0e0459bd4bdd53b5137d0803 fix segfault when $fastcgi_script_name is used in access_log and there was bad request (400) diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c --- a/src/http/modules/ngx_http_fastcgi_module.c +++ b/src/http/modules/ngx_http_fastcgi_module.c @@ -1969,28 +1969,39 @@ ngx_http_fastcgi_script_name_variable(ng u_char *p; ngx_http_fastcgi_loc_conf_t *flcf; - v->valid = 1; - v->no_cachable = 0; - v->not_found = 0; - - flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module); - - if (r->uri.data[r->uri.len - 1] != '/') { - v->len = r->uri.len; - v->data = r->uri.data; + if (r->uri.len) { + v->valid = 1; + v->no_cachable = 0; + v->not_found = 0; + + flcf = ngx_http_get_module_loc_conf(r, ngx_http_fastcgi_module); + + if (r->uri.data[r->uri.len - 1] != '/') { + v->len = r->uri.len; + v->data = r->uri.data; + return NGX_OK; + } + + v->len = r->uri.len + flcf->index.len; + + v->data = ngx_palloc(r->pool, v->len); + if (v->data == NULL) { + return NGX_ERROR; + } + + p = ngx_copy(v->data, r->uri.data, r->uri.len); + ngx_memcpy(p, flcf->index.data, flcf->index.len); + + } else { + v->len = 0; + v->valid = 1; + v->no_cachable = 0; + v->not_found = 0; + v->data = NULL; + return NGX_OK; } - v->len = r->uri.len + flcf->index.len; - - v->data = ngx_palloc(r->pool, v->len); - if (v->data == NULL) { - return NGX_ERROR; - } - - p = ngx_copy(v->data, r->uri.data, r->uri.len); - ngx_memcpy(p, flcf->index.data, flcf->index.len); - return NGX_OK; }