From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 7 Apr 2017 01:18:27 +0000 (-0400)
Subject: Don't crash on unexpected regex.  Closes #1959
X-Git-Tag: release_3_0_14~60
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=freeradius.git;a=commitdiff_plain;h=92d216f8a06f73feb79da2fe58e321481d88ced1

Don't crash on unexpected regex.  Closes #1959
---

diff --git a/src/main/pair.c b/src/main/pair.c
index fea349e..f679ade 100644
--- 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 5d6f626..8d3dde9 100644
--- 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[] = {