ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-29 15:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix underflow and overflow handling in the STAmount class. Add unit test.

Browse Source
This commit is contained in:
JoelKatz
2013-01-30 10:12:43 -08:00
parent 7186468706
commit 7213fb9f21
1 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/cpp/ripple/Amount.cpp
View File

@@ -479,23 +479,30 @@ void STAmount::canonicalize()
return; return;
} }
while (mValue < cMinValue) while ((mValue < cMinValue) && (mOffset > cMinOffset))
{ {
if (mOffset <= cMinOffset)
throw std::runtime_error("value overflow");
mValue *= 10; mValue *= 10;
if (mValue >= cMaxValue)
throw std::runtime_error("value overflow");
--mOffset; --mOffset;
} }
while (mValue > cMaxValue) while (mValue > cMaxValue)
{ {
if (mOffset >= cMaxOffset) if (mOffset >= cMaxOffset)
throw std::runtime_error("value underflow"); throw std::runtime_error("value overflow");
mValue /= 10; mValue /= 10;
++mOffset; ++mOffset;
} }
if (mOffset < cMinOffset)
{
mValue = 0;
mOffset = 0;
mIsNegative = false;
}
if (mOffset > cMaxOffset)
throw std::runtime_error("value overflow");
assert((mValue == 0) || ((mValue >= cMinValue) && (mValue <= cMaxValue))); assert((mValue == 0) || ((mValue >= cMinValue) && (mValue <= cMaxValue)));
assert((mValue == 0) || ((mOffset >= cMinOffset) && (mOffset <= cMaxOffset))); assert((mValue == 0) || ((mOffset >= cMinOffset) && (mOffset <= cMaxOffset)));
assert((mValue != 0) || (mOffset != -100)); assert((mValue != 0) || (mOffset != -100));
@@ -1556,6 +1563,37 @@ BOOST_AUTO_TEST_CASE( CurrencyMulDivTests )
mulTest(rand() % 10000000, rand() % 10000000); mulTest(rand() % 10000000, rand() % 10000000);
} }
BOOST_AUTO_TEST_CASE( UnderFlowTests )
{
STAmount bigNative(STAmount::cMaxNative / 2);
STAmount bigValue(CURRENCY_ONE, ACCOUNT_ONE,
(STAmount::cMinValue + STAmount::cMaxValue) / 2, STAmount::cMaxOffset - 1);
STAmount smallValue(CURRENCY_ONE, ACCOUNT_ONE,
(STAmount::cMinValue + STAmount::cMaxValue) / 2, STAmount::cMinOffset + 1);
STAmount zero(CURRENCY_ONE, ACCOUNT_ONE, 0);
STAmount smallXsmall = STAmount::multiply(smallValue, smallValue, CURRENCY_ONE, ACCOUNT_ONE);
if (!smallXsmall.isZero())
BOOST_FAIL("STAmount: smallXsmall != 0");
STAmount bigDsmall = STAmount::divide(smallValue, bigValue, CURRENCY_ONE, ACCOUNT_ONE);
if (!bigDsmall.isZero())
BOOST_FAIL("STAmount: small/big != 0: " << bigDsmall);
bigDsmall = STAmount::divide(smallValue, bigNative, CURRENCY_ONE, uint160());
if (!bigDsmall.isZero())
BOOST_FAIL("STAmount: small/bigNative != 0: " << bigDsmall);
bigDsmall = STAmount::divide(smallValue, bigValue, uint160(), uint160());
if (!bigDsmall.isZero())
BOOST_FAIL("STAmount: (small/big)->N != 0: " << bigDsmall);
bigDsmall = STAmount::divide(smallValue, bigNative, uint160(), uint160());
if (!bigDsmall.isZero())
BOOST_FAIL("STAmount: (small/bigNative)->N != 0: " << bigDsmall);
}
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()
// vim:ts=4 // vim:ts=4