diff --git a/Jint.Tests/Runtime/JsonTests.cs b/Jint.Tests/Runtime/JsonTests.cs new file mode 100644 index 0000000000..bd93205dd4 --- /dev/null +++ b/Jint.Tests/Runtime/JsonTests.cs @@ -0,0 +1,16 @@ +using Xunit; + +namespace Jint.Tests.Runtime +{ + public class JsonTests + { + [Fact] + public void CanParseTabsInProperties() + { + var engine = new Engine(); + const string script = @"JSON.parse(""{\""abc\\tdef\"": \""42\""}"");"; + var obj = engine.Execute(script).GetCompletionValue().AsObject(); + Assert.True(obj.HasOwnProperty("abc\tdef")); + } + } +} \ No newline at end of file diff --git a/Jint/Native/Json/JsonParser.cs b/Jint/Native/Json/JsonParser.cs index 62cb0d82ed..7b8c75523a 100644 --- a/Jint/Native/Json/JsonParser.cs +++ b/Jint/Native/Json/JsonParser.cs @@ -621,7 +621,7 @@ private void ThrowError(Token token, string messageFormat, params object[] argum index: token.Range[0], position: new Position(token.LineNumber ?? _lineNumber, token.Range[0] - _lineStart + 1)); var exception = new ParserException("Line " + lineNumber + ": " + msg, error); - + throw exception; } @@ -711,7 +711,7 @@ public ObjectInstance ParseJsonObject() } var name = Lex().Value.ToString(); - if (PropertyNameContainsInvalidChar0To31(name)) + if (PropertyNameContainsInvalidCharacters(name)) { ExceptionHelper.ThrowSyntaxError(_engine, $"Invalid character in property name '{name}'"); } @@ -732,14 +732,12 @@ public ObjectInstance ParseJsonObject() return obj; } - private static bool PropertyNameContainsInvalidChar0To31(string s) + private static bool PropertyNameContainsInvalidCharacters(string propertyName) { - const int max = 31; - - for (var i = 0; i < s.Length; i++) + const char max = (char) 31; + foreach (var c in propertyName) { - var val = (int)s[i]; - if (val <= max) + if (c != '\t' && c <= max) return true; } return false;