From: Maxim Dounin <mdounin@mdounin.ru>
Date: Fri, 29 Mar 2013 17:51:00 +0000 (+0000)
Subject: Merge of r5117, r5123: allocation errors handing during upgrade.
X-Git-Tag: release-1.2.8~6
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=188d0c0f5b64f1904056129e1fea27ea6b95cf1b;p=nginx.git

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

*) 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).
---

diff --git a/src/core/nginx.c b/src/core/nginx.c
index d02f9111d..045977691 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -594,6 +594,10 @@ ngx_exec_new_binary(ngx_cycle_t *cycle, char *const *argv)
     var = ngx_alloc(sizeof(NGINX_VAR)
                     + cycle->listening.nelts * (NGX_INT32_LEN + 1) + 2,
                     cycle->log);
+    if (var == NULL) {
+        ngx_free(env);
+        return NGX_INVALID_PID;
+    }
 
     p = ngx_cpymem(var, NGINX_VAR "=", sizeof(NGINX_VAR));