taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix #6148

Browse Source
This commit is contained in:
Christian Grothoff 2020-04-02 14:01:41 +02:00
parent a039926bb6
commit e9de3374a9
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/util/amount.c
View File

@ -529,26 +529,23 @@ TALER_amount_add (struct TALER_Amount *sum,
int int
TALER_amount_normalize (struct TALER_Amount *amount) TALER_amount_normalize (struct TALER_Amount *amount)
{ {
int ret; uint32_t overflow;
if (GNUNET_YES != TALER_amount_is_valid (amount)) if (GNUNET_YES != TALER_amount_is_valid (amount))
return GNUNET_SYSERR; return GNUNET_SYSERR;
ret = GNUNET_NO; if (amount->fraction < TALER_AMOUNT_FRAC_BASE)
while ( (amount->value != UINT64_MAX) && return GNUNET_NO;
(amount->fraction >= TALER_AMOUNT_FRAC_BASE) ) overflow = amount->fraction / TALER_AMOUT_FRAC_BASE;
amount->fraction %= TALER_AMOUNT_FRAC_BASE;
amount->value += overflow;
ret = GNUNET_OK;
if ( (amount->value < overflow) ||
(amount->value > MAX_AMOUNT_VALUE) )
{ {
amount->fraction -= TALER_AMOUNT_FRAC_BASE;
amount->value++;
ret = GNUNET_OK;
}
if (amount->fraction >= TALER_AMOUNT_FRAC_BASE)
{
/* failed to normalize, adding up fractions caused
main value to overflow! */
invalidate (amount); invalidate (amount);
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
return ret; return GNUNET_OK;
} }