-Fix reading hexadecimal numbers that contain an e
This commit is contained in:
@@ -671,7 +671,6 @@ namespace Newtonsoft.Json
|
||||
private void ParseNumber(char firstChar)
|
||||
{
|
||||
char currentChar = firstChar;
|
||||
bool nonBase10 = (firstChar == '0');
|
||||
|
||||
// parse until seperator character or end
|
||||
bool end = false;
|
||||
@@ -693,18 +692,17 @@ namespace Newtonsoft.Json
|
||||
object numberValue;
|
||||
JsonToken numberType;
|
||||
|
||||
if (number.IndexOf(".", StringComparison.OrdinalIgnoreCase) != -1
|
||||
|| number.IndexOf("e", StringComparison.OrdinalIgnoreCase) != -1)
|
||||
{
|
||||
numberValue = Convert.ToDouble(number, CultureInfo.InvariantCulture);
|
||||
numberType = JsonToken.Float;
|
||||
}
|
||||
else if (nonBase10)
|
||||
if (firstChar == '0' && !number.StartsWith("0.", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
numberValue = number.StartsWith("0x", StringComparison.OrdinalIgnoreCase)
|
||||
? Convert.ToInt64(number, 16)
|
||||
: Convert.ToInt64(number, 8);
|
||||
numberType = JsonToken.Integer;
|
||||
}
|
||||
else if (number.IndexOf(".", StringComparison.OrdinalIgnoreCase) != -1 || number.IndexOf("e", StringComparison.OrdinalIgnoreCase) != -1)
|
||||
{
|
||||
numberValue = Convert.ToDouble(number, CultureInfo.InvariantCulture);
|
||||
numberType = JsonToken.Float;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user