Merge pull request #5898 from Citadel-Station-13/upstream-merge-36286

[MIRROR] [s] Fix config loading exploit
2018-03-10 21:34:34 +00:00
parent aa7b9f192f 257b03b79f
commit b60b1c7aa8
1 changed files with 3 additions and 0 deletions
@@ -67,6 +67,9 @@
 	entries_by_type -= CE.type

 /datum/controller/configuration/proc/LoadEntries(filename, list/stack = list())
+	if(IsAdminAdvancedProcCall())
+		return
+
 	var/filename_to_test = world.system_type == MS_WINDOWS ? lowertext(filename) : filename
 	if(filename_to_test in stack)
 		log_config("Warning: Config recursion detected ([english_list(stack)]), breaking!")