]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Reset alternate on an additional code path
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Sun, 28 Jan 2018 22:53:24 +0000 (15:53 -0700)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Sun, 28 Jan 2018 23:06:20 +0000 (16:06 -0700)
src/main/xlat_eval.c

index 98a7d5fc8e601588be26c580440d98a2c155a388..bc57eb95605f16d37222f1fef68a943a2f558117 100644 (file)
@@ -836,13 +836,15 @@ xlat_action_t xlat_frame_eval_repeat(TALLOC_CTX *ctx, fr_cursor_t *out,
                        return XLAT_ACTION_PUSH_CHILD;
                }
 
+               *alternate = false;     /* Reset */
+
                xlat_debug_log_expansion(request, *in, NULL);
                xlat_debug_log_result(request, *result);
 
-               if (*result) (void) talloc_list_get_type_abort(*result, fr_value_box_t);
+               (void) talloc_list_get_type_abort(*result, fr_value_box_t);
                fr_cursor_init(&from, result);
                fr_cursor_merge(out, &from);
-
+               rad_assert(!*result);
        }
                break;