Patch potential string.Format exception

ServerMod · May 28, 2021 · 2c3fcf7 · 2c3fcf7
1 parent 9711bb3
commit 2c3fcf7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/MultiAdmin/Server.cs b/MultiAdmin/Server.cs
@@ -144,7 +144,7 @@ private set
 				// Update related variables
 				LogDirFile = string.IsNullOrEmpty(value) || string.IsNullOrEmpty(logDir)
 					? null
-					: $"{Path.Combine(logDir, value)}_{{0}}_log_{Port}.txt";
+					: $"{Path.Combine(logDir.EscapeFormat(), value)}_{{0}}_log_{Port}.txt";
 
 				lock (this)
 				{

diff --git a/MultiAdmin/Utility/StringExtensions.cs b/MultiAdmin/Utility/StringExtensions.cs
@@ -39,5 +39,15 @@ public static bool Equals(this string input, string value, int startIndex)
 
 			return Equals(input, value, startIndex, length);
 		}
+
+		/// <summary>
+		/// Escapes this <see cref="string"/> for use with <see cref="string.Format"/>
+		/// </summary>
+		/// <param name="input">The <see cref="string"/> to escape</param>
+		/// <returns>A <see cref="string"/> escaped for use with <see cref="string.Format"/></returns>
+		public static string EscapeFormat(this string input)
+		{
+			return input?.Replace("{", "{{").Replace("}", "}}");
+		}
 	}
 }