BUGFIX: CreateEscapedString better escaping of special (newline) char…

…acters.
Washi1337 · Nov 19, 2023 · 6e039b9 · 6e039b9
1 parent c5f86b9
commit 6e039b9
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/AsmResolver/ISegment.cs b/src/AsmResolver/ISegment.cs
@@ -36,8 +36,6 @@ bool CanUpdateOffsets
 
     public static partial class Extensions
     {
-        private const string ReservedStringCharacters = "\\\"\t\r\n\b";
-
         [ThreadStatic]
         private static StringBuilder? _buffer;
 
@@ -125,9 +123,22 @@ public static string CreateEscapedString(this string literal)
             _buffer.Append('"');
             foreach (char currentChar in literal)
             {
-                if (ReservedStringCharacters.Contains(currentChar))
-                    _buffer.Append('\\');
-                _buffer.Append(currentChar);
+                string? replacement = currentChar switch
+                {
+                    '\0' => "\\0",
+                    '\\' => "\\\\",
+                    '\"' => "\\\"",
+                    '\t' => "\\t",
+                    '\r' => "\\r",
+                    '\n' => "\\n",
+                    '\b' => "\\b",
+                    _ => null
+                };
+
+                if (replacement is not null)
+                    _buffer.Append(replacement);
+                else
+                    _buffer.Append(currentChar);
             }
             _buffer.Append('"');