-Changed exception thrown when parsing invalid Unicode escape sequence to JsonReaderException

This commit is contained in:
James Newton-King
2017-01-23 15:07:16 +13:00
parent 07b513cb83
commit c9cfff4fed
5 changed files with 72 additions and 33 deletions
@@ -983,6 +983,19 @@ null//comment
Assert.IsFalse(await r.ReadAsync()); 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 #endif
} }
} }
@@ -1029,5 +1029,18 @@ null//comment
GC.WaitForPendingFinalizers(); GC.WaitForPendingFinalizers();
Assert.AreEqual(1, UnmanagedResourceFakingJsonReader.DisposalCalls); 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] [Test]
public void HexParseOffset() 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); Assert.AreEqual(0, value);
} }
[Test] [Test]
public void HexParseError() public void HexParseError()
{ {
ExceptionAssert.Throws<FormatException>(() => { ConvertUtils.HexTextToInt("-100".ToCharArray(), 0, 4); }, "Invalid hex character: -"); int value;
ExceptionAssert.Throws<FormatException>(() => { ConvertUtils.HexTextToInt("000g".ToCharArray(), 0, 4); }, "Invalid hex character: g"); Assert.IsFalse(ConvertUtils.TryHexTextToInt("-100".ToCharArray(), 0, 4, out value));
ExceptionAssert.Throws<FormatException>(() => { ConvertUtils.HexTextToInt(" ssd".ToCharArray(), 0, 4); }, "Invalid hex character: "); Assert.IsFalse(ConvertUtils.TryHexTextToInt(" ssd".ToCharArray(), 0, 4, out value));
ExceptionAssert.Throws<FormatException>(() => { ConvertUtils.HexTextToInt("000:".ToCharArray(), 0, 4); }, "Invalid hex character: :"); Assert.IsFalse(ConvertUtils.TryHexTextToInt("000:".ToCharArray(), 0, 4, out value));
ExceptionAssert.Throws<FormatException>(() => { ConvertUtils.HexTextToInt("000G".ToCharArray(), 0, 4); }, "Invalid hex character: G"); Assert.IsFalse(ConvertUtils.TryHexTextToInt("000G".ToCharArray(), 0, 4, out value));
} }
private void HexParseSame(string text) private void HexParseSame(string text)
{ {
int v1 = int.Parse(text, NumberStyles.HexNumber, CultureInfo.InvariantCulture); 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); Assert.AreEqual(v1, v2, "Invalid result when parsing hex text: " + text);
} }
+12 -4
View File
@@ -1261,13 +1261,21 @@ namespace Newtonsoft.Json
{ {
if (enoughChars) if (enoughChars)
{ {
char hexChar = Convert.ToChar(ConvertUtils.HexTextToInt(_chars, _charPos, _charPos + 4)); int value;
_charPos += 4; if (ConvertUtils.TryHexTextToInt(_chars, _charPos, _charPos + 4, out value))
return hexChar; {
char hexChar = Convert.ToChar(value);
_charPos += 4;
return hexChar;
}
else
{
throw JsonReaderException.Create(this, @"Invalid Unicode escape sequence: \u{0}.".FormatWith(CultureInfo.InvariantCulture, new string(_chars, _charPos, 4)));
}
} }
else else
{ {
throw JsonReaderException.Create(this, "Unexpected end while parsing Unicode character."); throw JsonReaderException.Create(this, "Unexpected end while parsing Unicode escape sequence.");
} }
} }
+25 -22
View File
@@ -1381,34 +1381,37 @@ namespace Newtonsoft.Json.Utilities
#endif #endif
} }
public static int HexTextToInt(char[] text, int start, int end) public static bool TryHexTextToInt(char[] text, int start, int end, out int value)
{ {
int value = 0; value = 0;
for (int i = start; i < end; i++) for (int i = start; i < end; i++)
{ {
value += HexCharToInt(text[i]) << ((end - 1 - i) * 4); char ch = text[i];
} int chValue;
return value;
}
private static int HexCharToInt(char ch) if (ch <= 57 && ch >= 48)
{ {
if (ch <= 57 && ch >= 48) chValue = ch - 48;
{ }
return ch - 48; else if (ch <= 70 && ch >= 65)
{
chValue = ch - 55;
}
else if (ch <= 102 && ch >= 97)
{
chValue = ch - 87;
}
else
{
value = 0;
return false;
}
value += chValue << ((end - 1 - i) * 4);
} }
if (ch <= 70 && ch >= 65) return true;
{
return ch - 55;
}
if (ch <= 102 && ch >= 97)
{
return ch - 87;
}
throw new FormatException("Invalid hex character: " + ch);
} }
} }
} }