-Changed exception thrown when parsing invalid Unicode escape sequence to JsonReaderException
This commit is contained in:
@@ -983,6 +983,19 @@ null//comment
|
||||
|
||||
Assert.IsFalse(await r.ReadAsync());
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task InvalidUnicodeSequence()
|
||||
{
|
||||
string json1 = @"{'prop':'\u123!'}";
|
||||
|
||||
JsonTextReader r = new JsonTextReader(new StringReader(json1));
|
||||
|
||||
Assert.IsTrue(await r.ReadAsync());
|
||||
Assert.IsTrue(await r.ReadAsync());
|
||||
|
||||
await ExceptionAssert.ThrowsAsync<JsonReaderException>(async () => { await r.ReadAsync(); }, @"Invalid Unicode escape sequence: \u123!. Path 'prop', line 1, position 11.");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1029,5 +1029,18 @@ null//comment
|
||||
GC.WaitForPendingFinalizers();
|
||||
Assert.AreEqual(1, UnmanagedResourceFakingJsonReader.DisposalCalls);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void InvalidUnicodeSequence()
|
||||
{
|
||||
string json1 = @"{'prop':'\u123!'}";
|
||||
|
||||
JsonTextReader r = new JsonTextReader(new StringReader(json1));
|
||||
|
||||
Assert.IsTrue(r.Read());
|
||||
Assert.IsTrue(r.Read());
|
||||
|
||||
ExceptionAssert.Throws<JsonReaderException>(() => { r.Read(); }, @"Invalid Unicode escape sequence: \u123!. Path 'prop', line 1, position 11.");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -269,25 +269,27 @@ namespace Newtonsoft.Json.Tests.Utilities
|
||||
[Test]
|
||||
public void HexParseOffset()
|
||||
{
|
||||
int value = ConvertUtils.HexTextToInt("!0000".ToCharArray(), 1, 5);
|
||||
int value;
|
||||
Assert.IsTrue(ConvertUtils.TryHexTextToInt("!0000".ToCharArray(), 1, 5, out value));
|
||||
Assert.AreEqual(0, value);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void HexParseError()
|
||||
{
|
||||
ExceptionAssert.Throws<FormatException>(() => { ConvertUtils.HexTextToInt("-100".ToCharArray(), 0, 4); }, "Invalid hex character: -");
|
||||
ExceptionAssert.Throws<FormatException>(() => { ConvertUtils.HexTextToInt("000g".ToCharArray(), 0, 4); }, "Invalid hex character: g");
|
||||
ExceptionAssert.Throws<FormatException>(() => { ConvertUtils.HexTextToInt(" ssd".ToCharArray(), 0, 4); }, "Invalid hex character: ");
|
||||
ExceptionAssert.Throws<FormatException>(() => { ConvertUtils.HexTextToInt("000:".ToCharArray(), 0, 4); }, "Invalid hex character: :");
|
||||
ExceptionAssert.Throws<FormatException>(() => { ConvertUtils.HexTextToInt("000G".ToCharArray(), 0, 4); }, "Invalid hex character: G");
|
||||
int value;
|
||||
Assert.IsFalse(ConvertUtils.TryHexTextToInt("-100".ToCharArray(), 0, 4, out value));
|
||||
Assert.IsFalse(ConvertUtils.TryHexTextToInt(" ssd".ToCharArray(), 0, 4, out value));
|
||||
Assert.IsFalse(ConvertUtils.TryHexTextToInt("000:".ToCharArray(), 0, 4, out value));
|
||||
Assert.IsFalse(ConvertUtils.TryHexTextToInt("000G".ToCharArray(), 0, 4, out value));
|
||||
}
|
||||
|
||||
private void HexParseSame(string text)
|
||||
{
|
||||
int v1 = int.Parse(text, NumberStyles.HexNumber, CultureInfo.InvariantCulture);
|
||||
|
||||
int v2 = ConvertUtils.HexTextToInt(text.ToCharArray(), 0, 4);
|
||||
int v2;
|
||||
Assert.IsTrue(ConvertUtils.TryHexTextToInt(text.ToCharArray(), 0, 4, out v2));
|
||||
|
||||
Assert.AreEqual(v1, v2, "Invalid result when parsing hex text: " + text);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user