diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2013-09-16 18:49:10 +0400 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2013-09-16 18:49:10 +0400 |
| commit | f0fbcaf098680c885faf4561f4059d77424a19a6 (patch) | |
| tree | 5f19ec7164854c3e7b0571c00bf6657952634b9e | |
| parent | a11050ea4e4fa0c6996f9115e04635723a642f5f (diff) | |
| download | nginx-f0fbcaf098680c885faf4561f4059d77424a19a6.tar.gz nginx-f0fbcaf098680c885faf4561f4059d77424a19a6.zip | |
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.
| -rw-r--r-- | src/core/ngx_file.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c index 28e8871ec..a6ef100e0 100644 --- 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, ngx_path_t **path, ngx_path_t *prev, 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, ngx_path_t **path, ngx_path_t *prev, + 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; } |