Mercurial > hg > nginx
comparison src/http/modules/ngx_http_charset_filter_module.c @ 797:36f7b549f481
fix segfault if $server_addr failed
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 20 Oct 2006 19:07:50 +0000 |
parents | 907361d07f25 |
children | db7c468c447d |
comparison
equal
deleted
inserted
replaced
796:3db9dd3d9d8c | 797:36f7b549f481 |
---|---|
248 | 248 |
249 if (charset >= NGX_HTTP_CHARSET_VAR) { | 249 if (charset >= NGX_HTTP_CHARSET_VAR) { |
250 vv = ngx_http_get_indexed_variable(r, | 250 vv = ngx_http_get_indexed_variable(r, |
251 charset - NGX_HTTP_CHARSET_VAR); | 251 charset - NGX_HTTP_CHARSET_VAR); |
252 | 252 |
253 if (vv == NULL || vv->not_found) { | |
254 return NGX_ERROR; | |
255 } | |
256 | |
253 charset = ngx_http_charset_get_charset(charsets, n, | 257 charset = ngx_http_charset_get_charset(charsets, n, |
254 (ngx_str_t *) vv); | 258 (ngx_str_t *) vv); |
255 } | 259 } |
256 } | 260 } |
257 | 261 |
290 source_charset = lcf->source_charset; | 294 source_charset = lcf->source_charset; |
291 | 295 |
292 if (source_charset >= NGX_HTTP_CHARSET_VAR) { | 296 if (source_charset >= NGX_HTTP_CHARSET_VAR) { |
293 vv = ngx_http_get_indexed_variable(r, | 297 vv = ngx_http_get_indexed_variable(r, |
294 source_charset - NGX_HTTP_CHARSET_VAR); | 298 source_charset - NGX_HTTP_CHARSET_VAR); |
299 | |
300 if (vv == NULL || vv->not_found) { | |
301 return NGX_ERROR; | |
302 } | |
295 | 303 |
296 source_charset = ngx_http_charset_get_charset(charsets, n, | 304 source_charset = ngx_http_charset_get_charset(charsets, n, |
297 (ngx_str_t *) vv); | 305 (ngx_str_t *) vv); |
298 } | 306 } |
299 | 307 |