]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
clarify the code
authorAlan T. DeKok <aland@freeradius.org>
Fri, 19 Jan 2018 14:24:03 +0000 (09:24 -0500)
committerAlan T. DeKok <aland@freeradius.org>
Fri, 19 Jan 2018 18:36:55 +0000 (13:36 -0500)
We probably also want to check for names / da being NULL...
which seems to be an issue in rlm_cache.c:412

src/main/tmpl.c

index 200820af5d2306cb41ef8a4427a0a0defd845139..0d1a566aec31085c23de95a3960cf2404ac724e4 100644 (file)
@@ -1922,11 +1922,15 @@ size_t tmpl_snprint(char *out, size_t outlen, vp_tmpl_t const *vpt)
                goto inst_and_tag;
 
        case TMPL_TYPE_ATTR_UNDEFINED:
-       case TMPL_TYPE_ATTR:
                *out_p++ = '&';
+               p = vpt->tmpl_unknown_name;
+               goto print_name;
 
-               p = vpt->type == TMPL_TYPE_ATTR ? vpt->tmpl_da->name : vpt->tmpl_unknown_name;
+       case TMPL_TYPE_ATTR:
+               *out_p++ = '&';
+               p = vpt->tmpl_da->name;
 
+       print_name:
                /*
                 *      Don't add &current.
                 */