diff --git a/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs b/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs index 2b2d453a..cc45948f 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs @@ -1843,14 +1843,10 @@ third line", jsonTextReader.Value); Assert.AreEqual(Double.MinValue, reader.Value); reader = new JsonTextReader(new StringReader("1E+309")); - Assert.IsTrue(reader.Read()); - Assert.AreEqual(typeof(double), reader.ValueType); - Assert.AreEqual(Double.PositiveInfinity, reader.Value); + ExceptionAssert.Throws(() => reader.Read(), "Input string '1E+309' is not a valid number. Path '', line 1, position 6."); reader = new JsonTextReader(new StringReader("-1E+5000")); - Assert.IsTrue(reader.Read()); - Assert.AreEqual(typeof(double), reader.ValueType); - Assert.AreEqual(Double.NegativeInfinity, reader.Value); + ExceptionAssert.Throws(() => reader.Read(), "Input string '-1E+5000' is not a valid number. Path '', line 1, position 8."); reader = new JsonTextReader(new StringReader("5.1231231E")); ExceptionAssert.Throws(() => reader.Read(), "Input string '5.1231231E' is not a valid number. Path '', line 1, position 10."); diff --git a/Src/Newtonsoft.Json.Tests/Utilities/ConvertUtilsTests.cs b/Src/Newtonsoft.Json.Tests/Utilities/ConvertUtilsTests.cs index 4ceb163a..ef9fabc7 100644 --- a/Src/Newtonsoft.Json.Tests/Utilities/ConvertUtilsTests.cs +++ b/Src/Newtonsoft.Json.Tests/Utilities/ConvertUtilsTests.cs @@ -43,6 +43,72 @@ namespace Newtonsoft.Json.Tests.Utilities [TestFixture] public class ConvertUtilsTests : TestFixtureBase { + private void AssertDoubleTryParse(string s, ParseResult expectedResult, double? expectedValue) + { + double d; + char[] c = s.ToCharArray(); + ParseResult result = ConvertUtils.DoubleTryParse(c, 0, c.Length, out d); + + double d2; + bool result2 = double.TryParse(s, NumberStyles.Float, CultureInfo.InvariantCulture, out d2); + + Assert.AreEqual(expectedResult, result); + Assert.AreEqual(expectedResult == ParseResult.Success, result2); + + if (expectedValue != null) + { + Assert.AreEqual(expectedValue.Value, d); + + Assert.AreEqual(expectedValue, d2, "DoubleTryParse result is not equal to double.Parse"); + } + } + + [Test] + public void DoubleTryParse() + { + AssertDoubleTryParse("-123", ParseResult.Success, -123); + AssertDoubleTryParse("0", ParseResult.Success, 0); + AssertDoubleTryParse("123", ParseResult.Success, 123); + AssertDoubleTryParse("567.89", ParseResult.Success, 567.89); + AssertDoubleTryParse("-567.89", ParseResult.Success, -567.89); + AssertDoubleTryParse("1E23", ParseResult.Success, 1E23); + AssertDoubleTryParse("1E+23", ParseResult.Success, 1E+23); + AssertDoubleTryParse("1E-1", ParseResult.Success, 1E-1); + AssertDoubleTryParse("1E-2", ParseResult.Success, 1E-2); + AssertDoubleTryParse("1E-3", ParseResult.Success, 1E-3); + AssertDoubleTryParse("1E-4", ParseResult.Success, 1E-4); + AssertDoubleTryParse("1E-5", ParseResult.Success, 1E-5); + AssertDoubleTryParse("1E-10", ParseResult.Success, 1E-10); + AssertDoubleTryParse("1E-20", ParseResult.Success, 1E-20); + AssertDoubleTryParse("1", ParseResult.Success, null); + + //AssertDoubleTryParse("1E-23", ParseResult.Success, 1E-23); + //AssertDoubleTryParse("1E-25", ParseResult.Success, 1E-25); + //AssertDoubleTryParse("1E-50", ParseResult.Success, 1E-50); + //AssertDoubleTryParse("1E-75", ParseResult.Success, 1E-75); + AssertDoubleTryParse("1E-100", ParseResult.Success, 1E-100); + AssertDoubleTryParse("1E-300", ParseResult.Success, 1E-300); + + AssertDoubleTryParse("1E+309", ParseResult.Overflow, null); + AssertDoubleTryParse("-1E+5000", ParseResult.Overflow, null); + + AssertDoubleTryParse("", ParseResult.Invalid, null); + AssertDoubleTryParse("5.1231231E", ParseResult.Invalid, null); + AssertDoubleTryParse("1E+23i", ParseResult.Invalid, null); + AssertDoubleTryParse("1EE+23", ParseResult.Invalid, null); + AssertDoubleTryParse("1E++23", ParseResult.Invalid, null); + AssertDoubleTryParse("E23", ParseResult.Invalid, null); + + AssertDoubleTryParse("4.94065645841247E-324", ParseResult.Success, 4.94065645841247E-324); + AssertDoubleTryParse("4.94065645841247E-342", ParseResult.Success, 4.94065645841247E-342); + + AssertDoubleTryParse("1.7976931348623157E+308", ParseResult.Success, double.MaxValue); + AssertDoubleTryParse("-1.7976931348623157E+308", ParseResult.Success, double.MinValue); + + AssertDoubleTryParse("1.7976931348623159E+308", ParseResult.Overflow, null); + AssertDoubleTryParse("-1.7976931348623159E+308", ParseResult.Overflow, null); + } + [Test] public void Int64TryParse() { diff --git a/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs b/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs index 283130b8..7351adcf 100644 --- a/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs +++ b/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs @@ -931,7 +931,25 @@ namespace Newtonsoft.Json.Utilities } private const int MaxExponent = 308; - private static readonly double[] DoubleExponents = new double[] { 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9, 1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19, 1e20, 1e21, 1e22, 1e23, 1e24, 1e25, 1e26, 1e27, 1e28, 1e29, 1e30, 1e31, 1e32, 1e33, 1e34, 1e35, 1e36, 1e37, 1e38, 1e39, 1e40, 1e41, 1e42, 1e43, 1e44, 1e45, 1e46, 1e47, 1e48, 1e49, 1e50, 1e51, 1e52, 1e53, 1e54, 1e55, 1e56, 1e57, 1e58, 1e59, 1e60, 1e61, 1e62, 1e63, 1e64, 1e65, 1e66, 1e67, 1e68, 1e69, 1e70, 1e71, 1e72, 1e73, 1e74, 1e75, 1e76, 1e77, 1e78, 1e79, 1e80, 1e81, 1e82, 1e83, 1e84, 1e85, 1e86, 1e87, 1e88, 1e89, 1e90, 1e91, 1e92, 1e93, 1e94, 1e95, 1e96, 1e97, 1e98, 1e99, 1e100, 1e101, 1e102, 1e103, 1e104, 1e105, 1e106, 1e107, 1e108, 1e109, 1e110, 1e111, 1e112, 1e113, 1e114, 1e115, 1e116, 1e117, 1e118, 1e119, 1e120, 1e121, 1e122, 1e123, 1e124, 1e125, 1e126, 1e127, 1e128, 1e129, 1e130, 1e131, 1e132, 1e133, 1e134, 1e135, 1e136, 1e137, 1e138, 1e139, 1e140, 1e141, 1e142, 1e143, 1e144, 1e145, 1e146, 1e147, 1e148, 1e149, 1e150, 1e151, 1e152, 1e153, 1e154, 1e155, 1e156, 1e157, 1e158, 1e159, 1e160, 1e161, 1e162, 1e163, 1e164, 1e165, 1e166, 1e167, 1e168, 1e169, 1e170, 1e171, 1e172, 1e173, 1e174, 1e175, 1e176, 1e177, 1e178, 1e179, 1e180, 1e181, 1e182, 1e183, 1e184, 1e185, 1e186, 1e187, 1e188, 1e189, 1e190, 1e191, 1e192, 1e193, 1e194, 1e195, 1e196, 1e197, 1e198, 1e199, 1e200, 1e201, 1e202, 1e203, 1e204, 1e205, 1e206, 1e207, 1e208, 1e209, 1e210, 1e211, 1e212, 1e213, 1e214, 1e215, 1e216, 1e217, 1e218, 1e219, 1e220, 1e221, 1e222, 1e223, 1e224, 1e225, 1e226, 1e227, 1e228, 1e229, 1e230, 1e231, 1e232, 1e233, 1e234, 1e235, 1e236, 1e237, 1e238, 1e239, 1e240, 1e241, 1e242, 1e243, 1e244, 1e245, 1e246, 1e247, 1e248, 1e249, 1e250, 1e251, 1e252, 1e253, 1e254, 1e255, 1e256, 1e257, 1e258, 1e259, 1e260, 1e261, 1e262, 1e263, 1e264, 1e265, 1e266, 1e267, 1e268, 1e269, 1e270, 1e271, 1e272, 1e273, 1e274, 1e275, 1e276, 1e277, 1e278, 1e279, 1e280, 1e281, 1e282, 1e283, 1e284, 1e285, 1e286, 1e287, 1e288, 1e289, 1e290, 1e291, 1e292, 1e293, 1e294, 1e295, 1e296, 1e297, 1e298, 1e299, 1e300, 1e301, 1e302, 1e303, 1e304, 1e305, 1e306, 1e307, 1e308 }; + private static readonly double[] DoubleExponents = + { + 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9, 1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19, 1e20, + 1e21, 1e22, 1e23, 1e24, 1e25, 1e26, 1e27, 1e28, 1e29, 1e30, 1e31, 1e32, 1e33, 1e34, 1e35, 1e36, 1e37, 1e38, 1e39, 1e40, + 1e41, 1e42, 1e43, 1e44, 1e45, 1e46, 1e47, 1e48, 1e49, 1e50, 1e51, 1e52, 1e53, 1e54, 1e55, 1e56, 1e57, 1e58, 1e59, 1e60, + 1e61, 1e62, 1e63, 1e64, 1e65, 1e66, 1e67, 1e68, 1e69, 1e70, 1e71, 1e72, 1e73, 1e74, 1e75, 1e76, 1e77, 1e78, 1e79, 1e80, + 1e81, 1e82, 1e83, 1e84, 1e85, 1e86, 1e87, 1e88, 1e89, 1e90, 1e91, 1e92, 1e93, 1e94, 1e95, 1e96, 1e97, 1e98, 1e99, 1e100, + 1e101, 1e102, 1e103, 1e104, 1e105, 1e106, 1e107, 1e108, 1e109, 1e110, 1e111, 1e112, 1e113, 1e114, 1e115, 1e116, 1e117, 1e118, 1e119, 1e120, + 1e121, 1e122, 1e123, 1e124, 1e125, 1e126, 1e127, 1e128, 1e129, 1e130, 1e131, 1e132, 1e133, 1e134, 1e135, 1e136, 1e137, 1e138, 1e139, 1e140, + 1e141, 1e142, 1e143, 1e144, 1e145, 1e146, 1e147, 1e148, 1e149, 1e150, 1e151, 1e152, 1e153, 1e154, 1e155, 1e156, 1e157, 1e158, 1e159, 1e160, + 1e161, 1e162, 1e163, 1e164, 1e165, 1e166, 1e167, 1e168, 1e169, 1e170, 1e171, 1e172, 1e173, 1e174, 1e175, 1e176, 1e177, 1e178, 1e179, 1e180, + 1e181, 1e182, 1e183, 1e184, 1e185, 1e186, 1e187, 1e188, 1e189, 1e190, 1e191, 1e192, 1e193, 1e194, 1e195, 1e196, 1e197, 1e198, 1e199, 1e200, + 1e201, 1e202, 1e203, 1e204, 1e205, 1e206, 1e207, 1e208, 1e209, 1e210, 1e211, 1e212, 1e213, 1e214, 1e215, 1e216, 1e217, 1e218, 1e219, 1e220, + 1e221, 1e222, 1e223, 1e224, 1e225, 1e226, 1e227, 1e228, 1e229, 1e230, 1e231, 1e232, 1e233, 1e234, 1e235, 1e236, 1e237, 1e238, 1e239, 1e240, + 1e241, 1e242, 1e243, 1e244, 1e245, 1e246, 1e247, 1e248, 1e249, 1e250, 1e251, 1e252, 1e253, 1e254, 1e255, 1e256, 1e257, 1e258, 1e259, 1e260, + 1e261, 1e262, 1e263, 1e264, 1e265, 1e266, 1e267, 1e268, 1e269, 1e270, 1e271, 1e272, 1e273, 1e274, 1e275, 1e276, 1e277, 1e278, 1e279, 1e280, + 1e281, 1e282, 1e283, 1e284, 1e285, 1e286, 1e287, 1e288, 1e289, 1e290, 1e291, 1e292, 1e293, 1e294, 1e295, 1e296, 1e297, 1e298, 1e299, 1e300, + 1e301, 1e302, 1e303, 1e304, 1e305, 1e306, 1e307, 1e308 + }; public static ParseResult DoubleTryParse(char[] chars, int start, int length, out double value) { @@ -972,12 +990,20 @@ namespace Newtonsoft.Json.Utilities case 'e': case 'E': { + if (i == start) + { + return ParseResult.Invalid; + } i++; if (i == end) + { return ParseResult.Invalid; + } if (numDecimalStart < end) + { numDecimalEnd = i - 1; + } c = chars[i]; switch (c) @@ -996,7 +1022,9 @@ namespace Newtonsoft.Json.Utilities { c = chars[i]; if (c < '0' || c > '9') + { return ParseResult.Invalid; + } exponent = (10 * exponent) + (c - '0'); } @@ -1009,8 +1037,7 @@ namespace Newtonsoft.Json.Utilities { if (exponent > MaxExponent) { - value = isNegative ? double.NegativeInfinity : double.PositiveInfinity; - return ParseResult.Success; + return ParseResult.Overflow; } } } @@ -1052,6 +1079,11 @@ namespace Newtonsoft.Json.Utilities value /= DoubleExponents[exponent - 1]; } + if (double.IsPositiveInfinity(value)) + { + return ParseResult.Overflow; + } + if (isNegative) { value = -value;