From: Nick Porter <nick@portercomputing.co.uk>
Date: Tue, 29 Nov 2022 10:29:31 +0000 (+0000)
Subject: Ephemeral xlats do not rely on xlat thread instance data
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0d8da08face66a0cd22bdb39ccc253e426b3f30;p=thirdparty%2Ffreeradius-server.git

Ephemeral xlats do not rely on xlat thread instance data
---

diff --git a/src/lib/unlang/xlat_inst.c b/src/lib/unlang/xlat_inst.c
index d44cd4208c7..b8475027b06 100644
--- a/src/lib/unlang/xlat_inst.c
+++ b/src/lib/unlang/xlat_inst.c
@@ -362,12 +362,12 @@ xlat_thread_inst_t *xlat_thread_instance_find(xlat_exp_t const *node)
 	xlat_call_t const *call = &node->call;
 	xlat_thread_inst_t *xt;
 
+	if (call->ephemeral) return call->thread_inst;
+
 	fr_assert(xlat_thread_inst_tree);
 	fr_assert(node->type == XLAT_FUNC);
 	fr_assert(fr_heap_num_elements(xlat_thread_inst_tree) == fr_heap_num_elements(xlat_inst_tree));
 
-	if (call->ephemeral) return call->thread_inst;
-
 	/*
 	 *	This works because the comparator for
 	 *      the thread heap returns the same result