Merge pull request fdintino#60 from nkrobber/dev

vkholodkov · vkholodkov · commit aba1e3f34c75 · 2014-12-05T16:24:05.000+01:00
bug fix: fdintino#58 Segfaults after a few nginx reloads
diff --git a/ngx_http_upload_module.c b/ngx_http_upload_module.c
@@ -3050,7 +3050,7 @@ ngx_http_upload_merge_path_value(ngx_conf_t *cf, ngx_http_upload_path_t **path,
         return NGX_CONF_OK;
     }
 
-    *path = ngx_palloc(cf->pool, sizeof(ngx_http_upload_path_t));
+    *path = ngx_pcalloc(cf->pool, sizeof(ngx_http_upload_path_t));
     if(*path == NULL) {
         return NGX_CONF_ERROR;
     }

Original file line number	Diff line number	Diff line change
`@@ -3050,7 +3050,7 @@ ngx_http_upload_merge_path_value(ngx_conf_t cf, ngx_http_upload_path_t *path,`
`3050`	`3050`	`return NGX_CONF_OK;`
`3051`	`3051`	`}`
`3052`	`3052`
`3053`		`- *path = ngx_palloc(cf->pool, sizeof(ngx_http_upload_path_t));`
	`3053`	`+ *path = ngx_pcalloc(cf->pool, sizeof(ngx_http_upload_path_t));`
`3054`	`3054`	`if(*path == NULL) {`
`3055`	`3055`	`return NGX_CONF_ERROR;`
`3056`	`3056`	`}`