Mercurial > hg > nginx

comparison src/core/ngx_file.c @ 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 314c3d7cc3a5
children dd9cb4edf499
comparison
equal deleted inserted replaced
5374:ef3d094bb6d3 5375:7d8770196436
400 if (prev) { 400 if (prev) {
401 *path = prev; 401 *path = prev;
402 return NGX_CONF_OK; 402 return NGX_CONF_OK;
403 } 403 }
404 404
405 *path = ngx_palloc(cf->pool, sizeof(ngx_path_t)); 405 *path = ngx_pcalloc(cf->pool, sizeof(ngx_path_t));
406 if (*path == NULL) { 406 if (*path == NULL) {
407 return NGX_CONF_ERROR; 407 return NGX_CONF_ERROR;
408 } 408 }
409 409
410 (*path)->name = init->name; 410 (*path)->name = init->name;
418 (*path)->level[2] = init->level[2]; 418 (*path)->level[2] = init->level[2];
419 419
420 (*path)->len = init->level[0] + (init->level[0] ? 1 : 0) 420 (*path)->len = init->level[0] + (init->level[0] ? 1 : 0)
421 + init->level[1] + (init->level[1] ? 1 : 0) 421 + init->level[1] + (init->level[1] ? 1 : 0)
422 + init->level[2] + (init->level[2] ? 1 : 0); 422 + init->level[2] + (init->level[2] ? 1 : 0);
423
424 (*path)->manager = NULL;
425 (*path)->loader = NULL;
426 (*path)->conf_file = NULL;
427 423
428 if (ngx_add_path(cf, path) != NGX_OK) { 424 if (ngx_add_path(cf, path) != NGX_OK) {
429 return NGX_CONF_ERROR; 425 return NGX_CONF_ERROR;
430 } 426 }
431 427