diff --git a/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs b/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs index 853daeae..2b2d453a 100644 --- a/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs +++ b/Src/Newtonsoft.Json.Tests/JsonTextReaderTest.cs @@ -1831,6 +1831,29 @@ third line", jsonTextReader.Value); reader = new JsonTextReader(new StringReader("-")); ExceptionAssert.Throws(() => reader.Read(), "Input string '-' is not a valid number. Path '', line 1, position 1."); + + reader = new JsonTextReader(new StringReader("1.7976931348623157E+308")); + Assert.IsTrue(reader.Read()); + Assert.AreEqual(typeof(double), reader.ValueType); + Assert.AreEqual(Double.MaxValue, reader.Value); + + reader = new JsonTextReader(new StringReader("-1.7976931348623157E+308")); + Assert.IsTrue(reader.Read()); + Assert.AreEqual(typeof(double), reader.ValueType); + 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); + + reader = new JsonTextReader(new StringReader("-1E+5000")); + Assert.IsTrue(reader.Read()); + Assert.AreEqual(typeof(double), reader.ValueType); + Assert.AreEqual(Double.NegativeInfinity, reader.Value); + + 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."); } [Test] diff --git a/Src/Newtonsoft.Json/JsonTextReader.cs b/Src/Newtonsoft.Json/JsonTextReader.cs index cf2ca06b..6d806942 100644 --- a/Src/Newtonsoft.Json/JsonTextReader.cs +++ b/Src/Newtonsoft.Json/JsonTextReader.cs @@ -1973,10 +1973,9 @@ namespace Newtonsoft.Json } else { - string number = _stringReference.ToString(); - double value; - if (double.TryParse(number, NumberStyles.Float, CultureInfo.InvariantCulture, out value)) + ParseResult parseResult = ConvertUtils.DoubleTryParse(_stringReference.Chars, _stringReference.StartIndex, _stringReference.Length, out value); + if (parseResult == ParseResult.Success) { numberValue = value; } @@ -2055,7 +2054,8 @@ namespace Newtonsoft.Json else { double d; - if (double.TryParse(number, NumberStyles.Float | NumberStyles.AllowThousands, CultureInfo.InvariantCulture, out d)) + parseResult = ConvertUtils.DoubleTryParse(_stringReference.Chars, _stringReference.StartIndex, _stringReference.Length, out d); + if (parseResult == ParseResult.Success) { numberValue = d; } diff --git a/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs b/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs index 227db86d..283130b8 100644 --- a/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs +++ b/Src/Newtonsoft.Json/Utilities/ConvertUtils.cs @@ -930,6 +930,136 @@ namespace Newtonsoft.Json.Utilities return ParseResult.Success; } + 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 }; + + public static ParseResult DoubleTryParse(char[] chars, int start, int length, out double value) + { + value = 0; + + if (length == 0) + { + return ParseResult.Invalid; + } + + bool isNegative = (chars[start] == '-'); + if (isNegative) + { + // text just a negative sign + if (length == 1) + { + return ParseResult.Invalid; + } + + start++; + length--; + } + + var i = start; + int end = start + length; + int numDecimalStart = end; + int numDecimalEnd = end; + int exponent = 0; + bool exponentNegative = false; + for (; i < end; i++) + { + char c = chars[i]; + switch (chars[i]) + { + case '.': + numDecimalStart = i + 1; + break; + case 'e': + case 'E': + { + i++; + if (i == end) + return ParseResult.Invalid; + + if (numDecimalStart < end) + numDecimalEnd = i - 1; + + c = chars[i]; + switch (c) + { + case '-': + exponentNegative = true; + i++; + break; + case '+': + i++; + break; + } + + // parse 3 digit + for (;i < end;i++) + { + c = chars[i]; + if (c < '0' || c > '9') + return ParseResult.Invalid; + + exponent = (10 * exponent) + (c - '0'); + } + + if (exponentNegative) + { + exponent = -exponent; + } + else + { + if (exponent > MaxExponent) + { + value = isNegative ? double.NegativeInfinity : double.PositiveInfinity; + return ParseResult.Success; + } + } + } + break; + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + value = (10 * value) + (c - '0'); + break; + default: + return ParseResult.Invalid; + } + } + + // correct the decimal point + exponent -= (numDecimalEnd - numDecimalStart); + + if (exponent > 0) + { + value *= DoubleExponents[exponent - 1]; + } + else if (exponent < 0) + { + exponent = -exponent; + if (exponent > MaxExponent) + { + // cover 4.94065645841247E-324 + value /= DoubleExponents[154 - 1]; + exponent -= 154; + } + + value /= DoubleExponents[exponent - 1]; + } + + if (isNegative) + { + value = -value; + } + + return ParseResult.Success; + } + public static bool TryConvertGuid(string s, out Guid g) { // GUID has to have format 00000000-0000-0000-0000-000000000000