From 57cabd6b49a4bb332d3df6d0c7ea6ae1f2bda474 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Wed, 1 Feb 2006 20:01:51 +0000
Subject: nginx-0.3.25-RELEASE import

    *) Bugfix: the segmentation fault was occurred on start or while
       reconfiguration if there was invalid configuration; the bug had
       appeared in 0.3.24.
---
 src/core/ngx_cycle.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/core/ngx_cycle.c')

diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index 4bff82871..b5941be6f 100644
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -613,7 +613,10 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
 static void
 ngx_destroy_cycle_pools(ngx_conf_t *conf)
 {
-    ngx_shm_free(&conf->cycle->shm);
+    if (conf->cycle->shm.addr) {
+        ngx_shm_free(&conf->cycle->shm);
+    }
+
     ngx_destroy_pool(conf->temp_pool);
     ngx_destroy_pool(conf->pool);
 }
-- 
cgit