From 8def6be9dfcb1bb6657b718c40ecad1610cb1bbf Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 1 Feb 2006 20:00:07 +0000 Subject: Changes with nginx 0.3.25 01 Feb 2006 *) Bugfix: the segmentation fault was occurred on start or while reconfiguration if there was invalid configuration; bug 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 v1.2.1