diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-10-22 10:15:27 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-10-22 10:15:27 +0000 |
| commit | a40caa172c1f80f1974db1bf259ba65de577b5b0 (patch) | |
| tree | 2760c357a844e41ae0a122e77d7d2a3efb7873c4 | |
| parent | 11ab73e538fc8c37cc3f0de79e939e0dc027d15e (diff) | |
| download | nginx-a40caa172c1f80f1974db1bf259ba65de577b5b0.tar.gz nginx-a40caa172c1f80f1974db1bf259ba65de577b5b0.zip | |
fix segfault
| -rw-r--r-- | src/http/modules/ngx_http_charset_filter_module.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_charset_filter_module.c b/src/http/modules/ngx_http_charset_filter_module.c index 8c9fad6f9..f7d9906a8 100644 --- a/src/http/modules/ngx_http_charset_filter_module.c +++ b/src/http/modules/ngx_http_charset_filter_module.c @@ -1462,6 +1462,12 @@ ngx_http_charset_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) return NGX_CONF_OK; } + if (conf->source_charset >= NGX_HTTP_CHARSET_VAR + || conf->charset >= NGX_HTTP_CHARSET_VAR) + { + return NGX_CONF_OK; + } + mcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_charset_filter_module); recode = mcf->recodes.elts; |