clean up and check for subst==NULL

diff --git a/src/lib/util/print.c b/src/lib/util/print.c
index b8041fc313dd3e3bc4ab4babc8a0abfbad7de492..29e586955fe4c682eac043189549f3603e0a8323 100644 (file)
--- a/src/lib/util/print.c
+++ b/src/lib/util/print.c
@@ -685,17 +685,13 @@ static char *fr_vasprintf_internal(TALLOC_CTX *ctx, char const *fmt, va_list ap,
 
                                } else if (in) {
                                        fr_value_box_aprint(NULL, &subst, in, e_rules);
-                                       if (!subst) {
-                                               talloc_free(out);
-                                               va_end(ap_p);
-                                               va_end(ap_q);
-                                               return NULL;
-                                       }
                                } else {
                                        subst = talloc_typed_strdup(NULL, "(null)");
                                }
 
                        do_splice:
+                               if (!subst) goto oom;
+
                                p++;
 
                                /*
@@ -719,15 +715,15 @@ static char *fr_vasprintf_internal(TALLOC_CTX *ctx, char const *fmt, va_list ap,
                                        out = out_tmp;
 
                                        out_tmp = talloc_strdup_append_buffer(out, subst);
-                                       TALLOC_FREE(subst);
                                        if (!out_tmp) goto oom;
+                                       TALLOC_FREE(subst);
                                        out = out_tmp;
 
                                        va_end(ap_p);           /* one time use only */
                                } else {
                                        out_tmp = talloc_strdup_append_buffer(out, subst);
-                                       TALLOC_FREE(subst);
                                        if (!out_tmp) goto oom;
+                                       TALLOC_FREE(subst);
                                        out = out_tmp;
                                }
 
@@ -743,8 +739,6 @@ static char *fr_vasprintf_internal(TALLOC_CTX *ctx, char const *fmt, va_list ap,
 
                                if (!in) {
                                        subst = talloc_strdup(NULL, "(null)");
-                                       if (!subst) goto oom;
-
                                        goto do_splice;
                                }