mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 13:42:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use ngx_pcalloc() in ngx_conf_merge_path_value().

Browse Source 
It initializes the "data" pointer of ngx_path_t that will be checked after
subsequent changes.
This commit is contained in:
Valentin Bartenev 2013-09-16 18:49:10 +04:00
parent a11050ea4e
commit f0fbcaf098
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/ngx_file.c
View File

@ -402,7 +402,7 @@ ngx_conf_merge_path_value(ngx_conf_t *cf, ngx_path_t **path, ngx_path_t *prev,
return NGX_CONF_OK; return NGX_CONF_OK;
} }
*path = ngx_palloc(cf->pool, sizeof(ngx_path_t)); *path = ngx_pcalloc(cf->pool, sizeof(ngx_path_t));
if (*path == NULL) { if (*path == NULL) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
@ -421,10 +421,6 @@ ngx_conf_merge_path_value(ngx_conf_t *cf, ngx_path_t **path, ngx_path_t *prev,
+ init->level[1] + (init->level[1] ? 1 : 0) + init->level[1] + (init->level[1] ? 1 : 0)
+ init->level[2] + (init->level[2] ? 1 : 0); + init->level[2] + (init->level[2] ? 1 : 0);
(*path)->manager = NULL;
(*path)->loader = NULL;
(*path)->conf_file = NULL;
if (ngx_add_path(cf, path) != NGX_OK) { if (ngx_add_path(cf, path) != NGX_OK) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }