Handle predicate location variable error

Previously, the error was ignored and the predicate was treated as
false.  Now the error leads to the request finalization.

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index cfadaa7c0a33128769a714cfceb959efbec5a3b5..1bd8a55ab3c72a224c9f926da1f66817bc14a04e 100644 (file)
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1514,8 +1514,11 @@ ngx_http_core_find_location(ngx_http_request_t *r)
                            "test location: \"%V\"", &(*clcfp)->name);
 
             vv = ngx_http_get_flushed_variable(r, (*clcfp)->predicate - 1);
+            if (vv == NULL) {
+                return NGX_ERROR;
+            }
 
-            if (vv && vv->len && (vv->len != 1 || vv->data[0] != '0')) {
+            if (vv->len && (vv->len != 1 || vv->data[0] != '0')) {
                 r->loc_conf = (*clcfp)->loc_conf;
 
                 /* look up nested locations */