Mercurial > hg > nginx-ranges

diff src/core/ngx_cycle.c @ 156:65f0c23130e8 NGINX_0_3_25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.3.25 *) Bugfix: the segmentation fault was occurred on start or while reconfiguration if there was invalid configuration; bug appeared in 0.3.24.
author Igor Sysoev <http://sysoev.ru>
date Wed, 01 Feb 2006 00:00:00 +0300
parents bb61aa162c6b
children 73e8476f9142
line wrap: on
line diff
--- 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);
 }