Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue #380: Signed integer overflow check #390

Merged
merged 3 commits into from
Dec 13, 2016
Merged

Fix issue #380: Signed integer overflow check #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e98111
Fix issue #380: Signed integer overflow check
Dec 10, 2016
bd6422f
Ran `make pretty`
Dec 10, 2016
703d4ba
Fixed conversion warnings
Dec 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/json.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10619,19 +10619,19 @@ class basic_json
// skip if definitely not an integer
if (type != value_t::number_float)
{
// multiply last value by ten and add the new digit
auto temp = value * 10 + *curptr - '0';
auto digit = static_cast<number_unsigned_t>(*curptr - '0');

// test for overflow
if (temp < value || temp > max)
// overflow if value * 10 + digit > max, move terms around
// to avoid overflow in intermediate values
if (value > (max - digit) / 10)
{
// overflow
type = value_t::number_float;
}
else
{
// no overflow - save it
value = temp;
// no overflow
value = value * 10 + digit;
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/json.hpp.re2c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9769,19 +9769,19 @@ class basic_json
// skip if definitely not an integer
if (type != value_t::number_float)
{
// multiply last value by ten and add the new digit
auto temp = value * 10 + *curptr - '0';
auto digit = static_cast<number_unsigned_t>(*curptr - '0');

// test for overflow
if (temp < value || temp > max)
// overflow if value * 10 + digit > max, move terms around
// to avoid overflow in intermediate values
if (value > (max - digit) / 10)
{
// overflow
type = value_t::number_float;
}
else
{
// no overflow - save it
value = temp;
// no overflow
value = value * 10 + digit;
}
}
}
Expand Down