feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Changed integer storage from positive/negative to signed/unsigned

Browse Source
This commit is contained in:
Benoit Blanchon
2021-04-14 11:42:53 +02:00
parent a002393716
commit fc4f5fd05f
16 changed files with 251 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ArduinoJson/Numbers/parseNumber.hpp
View File

@ -69,11 +69,17 @@ inline bool parseNumber(const char* s, VariantData& result) {
}
if (*s == '\0') {
if (is_negative)
result.setNegativeInteger(UInt(mantissa));
else
result.setPositiveInteger(UInt(mantissa));
return true;
if (is_negative) {
const mantissa_t sintMantissaMax = mantissa_t(1)
<< (sizeof(Integer) * 8 - 1);
if (mantissa <= sintMantissaMax) {
result.setInteger(Integer(~mantissa + 1));
return true;
}
} else {
result.setInteger(UInt(mantissa));
return true;
}
}
// avoid mantissa overflow