commit 5a7661e5817532f5e9b08109e9cbc9915d2096f9
author Ruslan Ermilov <ru@nginx.com> Mon Mar 18 07:13:57 2013 +0000
committer Ruslan Ermilov <ru@nginx.com> Mon Mar 18 07:13:57 2013 +0000
tree 4d878c2390e5f3ca18bfba83c7b99698ae2c9555
parent bac0cb3bbd507400c9dbac03eacbb6c6937efccd

Core: guard against failed allocation during binary upgrade.

Patch by Piotr Sikora.

src/core/nginx.c

diff --git a/src/core/nginx.c b/src/core/nginx.c
index d02f911..e81e7af 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -594,6 +594,9 @@
     var = ngx_alloc(sizeof(NGINX_VAR)
                     + cycle->listening.nelts * (NGX_INT32_LEN + 1) + 2,
                     cycle->log);
+    if (var == NULL) {
+        return NGX_INVALID_PID;
+    }
 
     p = ngx_cpymem(var, NGINX_VAR "=", sizeof(NGINX_VAR));