Fix control character bug

taks · Dec 21, 2022 · 1691ab6 · 1691ab6
1 parent d64a5d2
commit 1691ab6
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/src/Tomlyn.Tests/ValidatorTests.cs b/src/Tomlyn.Tests/ValidatorTests.cs
@@ -89,5 +89,20 @@ public void TestTableArrayAndInvalidTable()
             Assert.True(doc.HasErrors, "The document should have errors");
         }
 
+        [Test]
+        public void TestValidControlCharacters()
+        {
+            var input = "";
+            input += "backspace='\b'\n";
+            input += "tab='\t'\n";
+            input += "form_feed='\f'\n";
+            input += "quote='\"'\n";
+            input += "backslash='\\'\n";
+            input += "heart='\u2665'\n";
+            input += "some_unicode='\U0002B695'\n";
+            var doc = Toml.Parse(input);
+            Assert.False(doc.HasErrors, "The document should not have errors on valid control characters");
+        }
+
     }
 }
diff --git a/src/Tomlyn/Parsing/Lexer.cs b/src/Tomlyn/Parsing/Lexer.cs
@@ -1016,7 +1016,7 @@ private void ReadStringLiteral(TextPosition start, bool allowMultiline)
                 {
                     AddError("Invalid newline in a string", _position, _position);
                 }
-                else if (CharHelper.IsControlCharacter(_c) && (!isMultiLine || !CharHelper.IsNewLine(_c)))
+                else if (CharHelper.IsControlCharacter(_c) && !CharHelper.IsNonNewlineValidControlCharacter(_c) && (!isMultiLine || !CharHelper.IsNewLine(_c)))
                 {
                     AddError($"Invalid control character found {((char)_c).ToPrintableString()}", start, start);
                 }

diff --git a/src/Tomlyn/Text/CharHelper.cs b/src/Tomlyn/Text/CharHelper.cs
@@ -24,6 +24,11 @@ public static bool IsControlCharacter(char32 c)
             return c <= 0x1F || c == 0x7F;
         }
 
+        public static bool IsNonNewlineValidControlCharacter(char32 c)
+        {
+            return c == '\b' || c == '\t' || c == '\f';
+        }
+
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool IsKeyStart(char32 c)
         {