From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 3 Jul 2018 17:43:36 +0000 (-0400)
Subject: Fix abort on error
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae88620929f42dd6685de4deaa09934e4db54705;p=thirdparty%2Ffreeradius-server.git

Fix abort on error
---

diff --git a/src/main/mainconfig.c b/src/main/mainconfig.c
index 3d7511aac65..55747fac344 100644
--- a/src/main/mainconfig.c
+++ b/src/main/mainconfig.c
@@ -1207,7 +1207,6 @@ do {\
 	 *	to ensure that the pointers are always valid.
 	 */
 	rad_assert(config->root_cs == NULL);
-	config->root_cs = cs;
 
 	DEBUG2("%s: #### Loading Clients ####", config->name);
 	if (!client_list_parse_section(cs, false)) goto failure;
@@ -1233,6 +1232,8 @@ do {\
 	}
 #endif
 
+	config->root_cs = cs;	/* Do this last to avoid dangling pointers on error */
+
 	/* Clear any unprocessed configuration errors */
 	(void) fr_strerror();