nginx: src/http/ngx_http_variables.c comparison

Added checks that disallow adding a variable with an empty name. Added variable name syntax checks to "geo" and "map" directives.

comparison

equal deleted inserted replaced

-:eaf95350d75c
+:8b635cf36ccc
 ngx_uint_t                  i;
 ngx_hash_key_t             *key;
 ngx_http_variable_t        *v;
 ngx_http_core_main_conf_t  *cmcf;
+if (name->len == 0) {
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+"invalid variable name \"$\"");
+return NULL;
+}
 cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
 key = cmcf->variables_keys->keys.elts;
 for (i = 0; i < cmcf->variables_keys->keys.nelts; i++) {
 if (name->len != key[i].key.len
 ngx_http_get_variable_index(ngx_conf_t *cf, ngx_str_t *name)
 {
 ngx_uint_t                  i;
 ngx_http_variable_t        *v;
 ngx_http_core_main_conf_t  *cmcf;
+if (name->len == 0) {
+ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+"invalid variable name \"$\"");
+return NGX_ERROR;
+}
 cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module);
 v = cmcf->variables.elts;

Mercurial > hg > nginx