Mercurial > hg > nginx

diff src/http/ngx_http_config.h @ 2713:b4d8aef4a1ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix segfault if no http section is defined in confguraiton, the bug has been introduced in r1259
author Igor Sysoev <igor@sysoev.ru>
date Wed, 15 Apr 2009 20:26:33 +0000
parents 5d2b8078c1c2
children d094e237abf4
line wrap: on
line diff
--- a/src/http/ngx_http_config.h
+++ b/src/http/ngx_http_config.h
@@ -69,8 +69,10 @@ typedef struct {
     ((ngx_http_conf_ctx_t *) cf->ctx)->loc_conf[module.ctx_index]
 
 #define ngx_http_cycle_get_module_main_conf(cycle, module)                    \
-    ((ngx_http_conf_ctx_t *)                                                  \
-         cycle->conf_ctx[ngx_http_module.index])->main_conf[module.ctx_index]
+    (cycle->conf_ctx[ngx_http_module.index] ?                                 \
+        ((ngx_http_conf_ctx_t *) cycle->conf_ctx[ngx_http_module.index])      \
+            ->main_conf[module.ctx_index]:                                    \
+        NULL)
 
 
 #endif /* _NGX_HTTP_CONFIG_H_INCLUDED_ */