Mercurial > hg > nginx
changeset 3122:3e994ac670dc
test space between "~" and regex in server_name and invalid_referers
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 14 Sep 2009 09:48:48 +0000 |
parents | bd2573c97e4a |
children | d364c2c12dd9 |
files | src/http/modules/ngx_http_referer_module.c src/http/ngx_http_core_module.c |
diffstat | 2 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_referer_module.c Mon Sep 14 07:42:01 2009 +0000 +++ b/src/http/modules/ngx_http_referer_module.c Mon Sep 14 09:48:48 2009 +0000 @@ -506,6 +506,11 @@ ngx_regex_elt_t *re; u_char errstr[NGX_MAX_CONF_ERRSTR]; + if (name->len == 1) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "empty regex in \"%V\"", name); + return NGX_CONF_ERROR; + } + if (rlcf->regex == NGX_CONF_UNSET_PTR) { rlcf->regex = ngx_array_create(cf->pool, 2, sizeof(ngx_regex_elt_t)); if (rlcf->regex == NULL) {
--- a/src/http/ngx_http_core_module.c Mon Sep 14 07:42:01 2009 +0000 +++ b/src/http/ngx_http_core_module.c Mon Sep 14 09:48:48 2009 +0000 @@ -3551,6 +3551,12 @@ ngx_str_t err; u_char errstr[NGX_MAX_CONF_ERRSTR]; + if (value[i].len == 1) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "empty regex in server name \"%V\"", &value[i]); + return NGX_CONF_ERROR; + } + err.len = NGX_MAX_CONF_ERRSTR; err.data = errstr;