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.

2 files changed, 5 insertions, 2 deletions

diff --git a/src/core/nginx.h b/src/core/nginx.h
index c2f9737a7..66df80dff 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -8,7 +8,7 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define NGINX_VER          "nginx/0.3.24"
+#define NGINX_VER          "nginx/0.3.25"
 
 #define NGINX_VAR          "NGINX"
 #define NGX_OLDPID_EXT     ".oldbin"
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);
 }