Fixed segfault with incorrect location nesting.
A configuration with a named location inside a zero-length prefix
or regex location used to trigger a segmentation fault, as
ngx_http_core_location() failed to properly detect if a nested location
was created. Example configuration to reproduce the problem:
location "" {
location @foo {}
}
Fix is to not rely on a parent location name length, but rather check
command type we are currently parsing.
Identical fix is also applied to ngx_http_rewrite_if(), which used to
incorrectly assume the "if" directive is on server{} level in such
locations.
Reported by Markus Linnala.
Found with afl-fuzz.
diff --git a/src/http/modules/ngx_http_rewrite_module.c b/src/http/modules/ngx_http_rewrite_module.c
index f241196..754512f 100644
--- a/src/http/modules/ngx_http_rewrite_module.c
+++ b/src/http/modules/ngx_http_rewrite_module.c
@@ -612,7 +612,7 @@
save = *cf;
cf->ctx = ctx;
- if (pclcf->name.len == 0) {
+ if (cf->cmd_type == NGX_HTTP_SRV_CONF) {
if_code->loc_conf = NULL;
cf->cmd_type = NGX_HTTP_SIF_CONF;
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 0a5b6b4..5cdf987 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -3196,7 +3196,7 @@
pclcf = pctx->loc_conf[ngx_http_core_module.ctx_index];
- if (pclcf->name.len) {
+ if (cf->cmd_type == NGX_HTTP_LOC_CONF) {
/* nested location */