Mercurial > hg > nginx

changeset 5375:7d8770196436

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Valentin Bartenev <vbart@nginx.com>
date Mon, 16 Sep 2013 18:49:10 +0400
parents ef3d094bb6d3
children dd9cb4edf499
files src/core/ngx_file.c
diffstat 1 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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;
     }