Skip to content

Commit f7752ad

Browse files
committed
util: check MoneyRange() inside ParseMoney()
1 parent 5ef2738 commit f7752ad

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/test/util_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,6 @@ BOOST_AUTO_TEST_CASE(util_ParseMoney)
12261226

12271227
BOOST_CHECK_EQUAL(ParseMoney("12345.6789").value(), (COIN/10000)*123456789);
12281228

1229-
BOOST_CHECK_EQUAL(ParseMoney("100000000.00").value(), COIN*100000000);
12301229
BOOST_CHECK_EQUAL(ParseMoney("10000000.00").value(), COIN*10000000);
12311230
BOOST_CHECK_EQUAL(ParseMoney("1000000.00").value(), COIN*1000000);
12321231
BOOST_CHECK_EQUAL(ParseMoney("100000.00").value(), COIN*100000);
@@ -1252,6 +1251,7 @@ BOOST_AUTO_TEST_CASE(util_ParseMoney)
12521251
BOOST_CHECK_EQUAL(ParseMoney(" 0.00000001").value(), COIN/100000000);
12531252

12541253
// Parsing amount that can not be represented should fail
1254+
BOOST_CHECK(!ParseMoney("100000000.00"));
12551255
BOOST_CHECK(!ParseMoney("0.000000001"));
12561256

12571257
// Parsing empty string should fail

src/util/moneystr.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,9 @@ std::optional<CAmount> ParseMoney(const std::string& money_string)
8181

8282
CAmount value = nWhole * COIN + nUnits;
8383

84+
if (!MoneyRange(value)) {
85+
return std::nullopt;
86+
}
87+
8488
return value;
8589
}

0 commit comments

Comments
 (0)