]> git.kaiwu.me - nginx.git/commitdiff
Use ngx_pcalloc() in ngx_conf_merge_path_value().
authorValentin Bartenev <vbart@nginx.com>
Mon, 16 Sep 2013 14:49:10 +0000 (18:49 +0400)
committerValentin Bartenev <vbart@nginx.com>
Mon, 16 Sep 2013 14:49:10 +0000 (18:49 +0400)
It initializes the "data" pointer of ngx_path_t that will be checked after
subsequent changes.

src/core/ngx_file.c

index 28e8871ece477d7e1c7984e6d4a77b1bc226ecc6..a6ef100e0b05a6c3576d3af3429588a5bd9e04e2 100644 (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;
     }
 
-    *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;
     }