diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-02-01 20:01:51 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-02-01 20:01:51 +0000 |
| commit | 57cabd6b49a4bb332d3df6d0c7ea6ae1f2bda474 (patch) | |
| tree | ea369c0a3170bde519eb052822bdc8032506489a /src/core/ngx_cycle.c | |
| parent | 988a478464493ae8fe3045cd0a1981c3a82da509 (diff) | |
| download | nginx-release-0.3.25.tar.gz nginx-release-0.3.25.zip | |
nginx-0.3.25-RELEASE importrelease-0.3.25
*) Bugfix: the segmentation fault was occurred on start or while
reconfiguration if there was invalid configuration; the bug had
appeared in 0.3.24.
Diffstat (limited to 'src/core/ngx_cycle.c')
| -rw-r--r-- | src/core/ngx_cycle.c | 5 |
1 files changed, 4 insertions, 1 deletions
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); } |