Proper quoting of strings in trace config (#1149).

cincuranet · Dec 10, 2023 · 87933e5 · 87933e5
1 parent 7b08f61
commit 87933e5
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/FirebirdSql.Data.FirebirdClient/Services/FbTraceConfiguration.cs b/src/FirebirdSql.Data.FirebirdClient/Services/FbTraceConfiguration.cs
@@ -15,11 +15,7 @@
 
 //$Authors = Jiri Cincura ([email protected])
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
 
 namespace FirebirdSql.Data.Services;
 
@@ -32,7 +28,12 @@ protected static string WriteBoolValue(bool b)
 
 	protected static string WriteString(string s)
 	{
-		return string.Format("'{0}'", s);
+		s = s
+			.Replace("{", "{{")
+			.Replace("}", "}}")
+			.Replace(@"\", @"\\")
+			.Replace("\"", "\\\"");
+		return string.Format("\"{0}\"", s);
 	}
 
 	protected static string WriteNumber(int i)
@@ -42,6 +43,6 @@ protected static string WriteNumber(int i)
 
 	protected static string WriteRegEx(string re)
 	{
-		return WriteString(re.Replace(@"\", @"\\").Replace("'", @"\'"));
+		return WriteString(re);
 	}
 }