# HG changeset patch # User Valentin Bartenev # Date 1379342950 -14400 # Node ID 7d877019643683b5ee86a44fd9cf62c52ba43071 # Parent ef3d094bb6d351d790488e3ce222ea193903fbf2 Use ngx_pcalloc() in ngx_conf_merge_path_value(). It initializes the "data" pointer of ngx_path_t that will be checked after subsequent changes. diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -402,7 +402,7 @@ ngx_conf_merge_path_value(ngx_conf_t *cf 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) { return NGX_CONF_ERROR; } @@ -421,10 +421,6 @@ ngx_conf_merge_path_value(ngx_conf_t *cf + init->level[1] + (init->level[1] ? 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) { return NGX_CONF_ERROR; }