From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 28 Jan 2018 22:53:24 +0000 (-0700)
Subject: Reset alternate on an additional code path
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee87970f16ed2f97dc17538dc0d40f2bd18f710b;p=thirdparty%2Ffreeradius-server.git

Reset alternate on an additional code path
---

diff --git a/src/main/xlat_eval.c b/src/main/xlat_eval.c
index 98a7d5fc8e6..bc57eb95605 100644
--- a/src/main/xlat_eval.c
+++ b/src/main/xlat_eval.c
@@ -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;