From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 6 Jul 2022 14:50:26 +0000 (-0400)
Subject: always assign t_rules.  Fixes #4594
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bdb670034831700a555f8a5b99327a75c3ac63a;p=thirdparty%2Ffreeradius-server.git

always assign t_rules.  Fixes #4594

t_rules is checked for NULL, but it later always dereferenced.
So just assign it to default_rules.
---

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;