mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-21 19:56:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge of r5117, r5123: allocation errors handing during upgrade.

Browse Source 
*) Core: guard against failed allocation during binary upgrade.
   Patch by Piotr Sikora.

*) Core: fixed resource leak if binary upgrade fails due to no memory.
   Found by Coverity (CID 992320).
This commit is contained in:
Maxim Dounin 2013-03-29 17:51:00 +00:00
parent 53516741fc
commit 188d0c0f5b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/nginx.c
View File

@ -594,6 +594,10 @@ ngx_exec_new_binary(ngx_cycle_t *cycle, char *const *argv)
var = ngx_alloc(sizeof(NGINX_VAR) var = ngx_alloc(sizeof(NGINX_VAR)
+ cycle->listening.nelts * (NGX_INT32_LEN + 1) + 2, + cycle->listening.nelts * (NGX_INT32_LEN + 1) + 2,
cycle->log); cycle->log);
if (var == NULL) {
ngx_free(env);
return NGX_INVALID_PID;
}
p = ngx_cpymem(var, NGINX_VAR "=", sizeof(NGINX_VAR)); p = ngx_cpymem(var, NGINX_VAR "=", sizeof(NGINX_VAR));