From 0bdb670034831700a555f8a5b99327a75c3ac63a Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Wed, 6 Jul 2022 10:50:26 -0400 Subject: [PATCH] always assign t_rules. Fixes #4594 t_rules is checked for NULL, but it later always dereferenced. So just assign it to default_rules. --- src/lib/server/tmpl_tokenize.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib/server/tmpl_tokenize.c b/src/lib/server/tmpl_tokenize.c index 2dfbaeb70a7..093a1550909 100644 --- a/src/lib/server/tmpl_tokenize.c +++ b/src/lib/server/tmpl_tokenize.c @@ -1969,11 +1969,8 @@ ssize_t tmpl_afrom_attr_substr(TALLOC_CTX *ctx, tmpl_attr_error_t *err, tmpl_attr_rules_t const *t_attr_rules; fr_sbuff_marker_t m_l; - if (!t_rules) { - t_attr_rules = &default_rules.attr; /* Use the defaults */ - } else { - t_attr_rules = &t_rules->attr; - } + if (!t_rules) t_rules = &default_rules; + t_attr_rules = &t_rules->attr; if (err) *err = TMPL_ATTR_ERROR_NONE; -- 2.47.3