Don't crash on unexpected regex. Closes #1959

diff --git a/src/main/pair.c b/src/main/pair.c
index fea349ee3155586b1e9b247d66de6e26e84bbeb6..f679adef419fd6beac4fccd16382da89d733ab83 100644 (file)
--- a/src/main/pair.c
+++ b/src/main/pair.c
@@ -79,6 +79,8 @@ int radius_compare_vps(UNUSED REQUEST *request, VALUE_PAIR *check, VALUE_PAIR *v
                char *expr = NULL, *value = NULL;
                char const *expr_p, *value_p;
 
+               if (!vp) return -2;
+
                if (check->da->type == PW_TYPE_STRING) {
                        expr_p = check->vp_strvalue;
                } else {

diff --git a/src/modules/rlm_expr/paircmp.c b/src/modules/rlm_expr/paircmp.c
index 5d6f6264f0bbe3678fe1c75c144c3596427775a2..8d3dde9fecdeab9f2ae7022ae54fd2564528da1f 100644 (file)
--- a/src/modules/rlm_expr/paircmp.c
+++ b/src/modules/rlm_expr/paircmp.c
@@ -217,7 +217,7 @@ static int genericcmp(UNUSED void *instance,
        /*
         *      Will do the xlat for us
         */
-       return radius_compare_vps(request, check, NULL);
+       return radius_compare_vps(request, check, req);
 }
 
 static int generic_attrs[] = {