From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 11 May 2017 13:57:33 +0000 (-0400)
Subject: convert assert to run-time check.
X-Git-Tag: release_3_0_14~38
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=freeradius.git;a=commitdiff_plain;h=9cf56194237358283b2c589d77f2c4140e0cb49d

convert assert to run-time check.
---

diff --git a/src/main/evaluate.c b/src/main/evaluate.c
index f01eeec..49ef708 100644
--- a/src/main/evaluate.c
+++ b/src/main/evaluate.c
@@ -164,8 +164,7 @@ static int cond_do_regex(REQUEST *request, fr_cond_t const *c,
 	regmatch_t	rxmatch[REQUEST_MAX_REGEX + 1];	/* +1 for %{0} (whole match) capture group */
 	size_t		nmatch = sizeof(rxmatch) / sizeof(regmatch_t);
 
-	rad_assert(lhs_type == PW_TYPE_STRING);
-	rad_assert(lhs != NULL);
+	if (!lhs || (lhs_type != PW_TYPE_STRING)) return -1;
 
 	EVAL_DEBUG("CMP WITH REGEX %s %s",
 		   map->rhs->tmpl_iflag ? "CASE INSENSITIVE" : "CASE SENSITIVE",