dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Update from_multiplier () overflow checks (#2337)

Browse source
This commit is contained in:
Sergey Kroshnin 2019-10-11 16:51:29 +03:00 • committed by GitHub
commit 7a81bce13b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
nano/lib/numbers.cpp
View file

@ -915,8 +915,19 @@ std::string nano::to_string (double const value_a, int const precision_a)
uint64_t nano::difficulty::from_multiplier (double const multiplier_a, uint64_t const base_difficulty_a) uint64_t nano::difficulty::from_multiplier (double const multiplier_a, uint64_t const base_difficulty_a)
{ {
assert (multiplier_a > 0.); assert (multiplier_a > 0.);
uint64_t reverse_difficulty (static_cast<uint64_t> ((-base_difficulty_a) / multiplier_a)); nano::uint128_t reverse_difficulty ((-base_difficulty_a) / multiplier_a);
return (reverse_difficulty != 0 || base_difficulty_a == 0 || multiplier_a < 1. ? -reverse_difficulty : std::numeric_limits<std::uint64_t>::max ()); if (reverse_difficulty > std::numeric_limits<std::uint64_t>::max ())
{
return 0;
}
else if (reverse_difficulty != 0 || base_difficulty_a == 0 || multiplier_a < 1.)
{
return -(static_cast<uint64_t> (reverse_difficulty));
}
else
{
return std::numeric_limits<std::uint64_t>::max ();
}
} }
double nano::difficulty::to_multiplier (uint64_t const difficulty_a, uint64_t const base_difficulty_a) double nano::difficulty::to_multiplier (uint64_t const difficulty_a, uint64_t const base_difficulty_a)