Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

print_fixed_decimal_point() and print_money_brief() fixed for too big decimal point values

Browse source
This commit is contained in:
sowle 2024-07-07 20:34:19 +02:00
parent bb6fa6f7bd
commit e2998acc9d
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/epee/include/print_fixed_point_helper.h
View file

@ -36,6 +36,8 @@ namespace epee
inline std::string print_fixed_decimal_point(t_number amount, size_t decimal_point)
{
std::string s = boost::lexical_cast<std::string>(amount);
if (decimal_point > 32)
return std::string("!!") + s; // avoiding overflow issues
if (s.size() < decimal_point + 1)
{
s.insert(0, decimal_point + 1 - s.size(), '0');

21
src/currency_core/currency_format_utils.cpp
View file

@ -3463,6 +3463,27 @@ namespace currency
//---------------------------------------------------------------
std::string print_money_brief(uint64_t amount, size_t decimal_point /* = CURRENCY_DISPLAY_DECIMAL_POINT */)
{
// TODO: temporary fix for insanely big decimal points
// TODO: remove it after setting the limit to 18 -- sowle
if (decimal_point > 32)
return std::string("!!") + std::to_string(amount);
if (decimal_point >= 20)
{
std::string r = std::to_string(amount);
if (decimal_point + 1 > r.size())
r.insert(0, decimal_point - r.size() + 1, '0');
r.insert(r.begin() + 1, '.');
size_t p = r.find_last_not_of('0');
if (p != r.npos)
{
if (r[p] != '.' && p + 1 < r.size())
r.erase(p + 1);
else if (p + 2 < r.size())
r.erase(p + 2);
}
return r;
}
uint64_t coin = decimal_point == CURRENCY_DISPLAY_DECIMAL_POINT ? COIN : crypto::constexpr_pow(decimal_point, 10);
uint64_t remainder = amount % coin;
amount /= coin;