diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-04-15 20:26:33 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-04-15 20:26:33 +0000 |
| commit | ca878c8ccc38800b770c7fc7c24b1e97de42c640 (patch) | |
| tree | b6c5e2cdaa2bebbdcd090eaaa0a4765bd2d3e8dd /src/http/ngx_http_config.h | |
| parent | 60798fbea5cf1287aec41c886a1b53dd67304641 (diff) | |
| download | nginx-ca878c8ccc38800b770c7fc7c24b1e97de42c640.tar.gz nginx-ca878c8ccc38800b770c7fc7c24b1e97de42c640.zip | |
fix segfault if no http section is defined in confguraiton,
the bug has been introduced in r1259
Diffstat (limited to 'src/http/ngx_http_config.h')
| -rw-r--r-- | src/http/ngx_http_config.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/http/ngx_http_config.h b/src/http/ngx_http_config.h index 66292105a..74f6f6c51 100644 --- 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_ */ |