Skip to content

Commit 16c97cd

Browse files
committed
Fix implicit signed/unsigned conversion and a small glitch in the error computation
1 parent 2ea4343 commit 16c97cd

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

include/rapidjson/internal/strtod.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,10 +162,10 @@ inline bool StrtodDiyFp(const char* decimals, int dLen, int dExp, double* result
162162
DiyFp(RAPIDJSON_UINT64_C2(0xf4240000, 00000000), -44), // 10^6
163163
DiyFp(RAPIDJSON_UINT64_C2(0x98968000, 00000000), -40) // 10^7
164164
};
165-
int adjustment = dExp - actualExp - 1;
166-
RAPIDJSON_ASSERT(adjustment >= 0 && adjustment < 7);
167-
v = v * kPow10[adjustment];
168-
if (dLen + static_cast<unsigned>(adjustment)> 19u) // has more digits than decimal digits in 64-bit
165+
int adjustment = dExp - actualExp;
166+
RAPIDJSON_ASSERT(adjustment >= 1 && adjustment < 8);
167+
v = v * kPow10[adjustment - 1];
168+
if (dLen + adjustment > 19u) // has more digits than decimal digits in 64-bit
169169
error += kUlp / 2;
170170
}
171171

0 commit comments

Comments
 (0)