]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
always assign t_rules. Fixes #4594
authorAlan T. DeKok <aland@freeradius.org>
Wed, 6 Jul 2022 14:50:26 +0000 (10:50 -0400)
committerAlan T. DeKok <aland@freeradius.org>
Wed, 6 Jul 2022 15:41:53 +0000 (11:41 -0400)
t_rules is checked for NULL, but it later always dereferenced.
So just assign it to default_rules.

src/lib/server/tmpl_tokenize.c

index 2dfbaeb70a77a3652df9747795cfa91433be8c58..093a15509091db554ab2ae8eafd375192923aaa5 100644 (file)
@@ -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;