# HG changeset patch
# User Igor Sysoev <http://sysoev.ru>
# Date 1138741200 -10800
# Node ID 65f0c23130e88d44291d1932f3311ca7ea0cfd73
# Parent  9ac6f1e81424fa0d57a3dff41c72f58da524f6cb
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.

diff --git a/CHANGES b/CHANGES
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+
+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.
+
 
 Changes with nginx 0.3.24                                        01 Feb 2006
 
diff --git a/CHANGES.ru b/CHANGES.ru
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,3 +1,10 @@
+
+Изменения в nginx 0.3.25                                          01.02.2006
+
+    *) Исправление: при неверной конфигурации на старте или во время 
+       переконфигурации происходил segmentation fault; ошибка появилась в 
+       0.3.24.
+
 
 Изменения в nginx 0.3.24                                          01.02.2006
 
diff --git a/src/core/nginx.h b/src/core/nginx.h
--- 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
--- 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);
 }