projects
/
freeradius.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3712276
)
convert assert to run-time check.
author
Alan T. DeKok
<aland@freeradius.org>
Thu, 11 May 2017 13:57:33 +0000
(09:57 -0400)
committer
Alan T. DeKok
<aland@freeradius.org>
Thu, 11 May 2017 13:57:33 +0000
(09:57 -0400)
src/main/evaluate.c
patch
|
blob
|
history
diff --git
a/src/main/evaluate.c
b/src/main/evaluate.c
index
f01eeec
..
49ef708
100644
(file)
--- 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",