generic-library/jsoncpp
1
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-10-10 17:43:46 +02:00
Code Issues Projects Releases Wiki Activity

Fixed a parsing bug in decodeNumber, updating the failing test cases to be

Browse Source 
correct in the process. (The test cases incorrectly used exact integers instead
of scientific notation.)
This commit is contained in:
Aaron Jacobs
2011-05-24 03:59:24 +00:00
parent e656c5fa2d
commit ae9ffb5443
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib_json/json_reader.cpp
View File

@@ -573,8 +573,6 @@ Reader::decodeNumber( Token &token )
Value::LargestUInt maxIntegerValue = isNegative ? Value::LargestUInt(-Value::minLargestInt) Value::LargestUInt maxIntegerValue = isNegative ? Value::LargestUInt(-Value::minLargestInt)
: Value::maxLargestUInt; : Value::maxLargestUInt;
Value::LargestUInt threshold = maxIntegerValue / 10; Value::LargestUInt threshold = maxIntegerValue / 10;
Value::UInt lastDigitThreshold = Value::UInt( maxIntegerValue % 10 );
assert( lastDigitThreshold >=0 && lastDigitThreshold <= 9 );
Value::LargestUInt value = 0; Value::LargestUInt value = 0;
while ( current < token.end_ ) while ( current < token.end_ )
{ {
@@ -584,10 +582,13 @@ Reader::decodeNumber( Token &token )
Value::UInt digit(c - '0'); Value::UInt digit(c - '0');
if ( value >= threshold ) if ( value >= threshold )
{ {
// If the current digit is not the last one, or if it is // We've hit or exceeded the max value divided by 10 (rounded down). If
// greater than the last digit of the maximum integer value, // a) we've only just touched the limit, b) this is the last digit, and
// the parse the number as a double. // c) it's small enough to fit in that rounding delta, we're okay.
if ( current != token.end_ || digit > lastDigitThreshold ) // Otherwise treat this number as a double to avoid overflow.
if (value > threshold ||
current != token.end_ ||
digit > maxIntegerValue % 10)
{ {
return decodeDouble( token ); return decodeDouble( token );
} }

2
test/data/test_real_09.expected
View File

@@ -1 +1 @@
.=19000000000000000001 .=1.9e+19

2
test/data/test_real_11.expected
View File

@@ -1 +1 @@
.=-9300000000000000001 .=-9.3e+18

1
test/data/test_real_12.expected Normal file
View File

@@ -0,0 +1 @@
.=1.844674407370955e+19

2
test/data/test_real_12.json Normal file
View File

@@ -0,0 +1,2 @@
// 2^64 -> switch to double.
18446744073709551616