games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-29 21:56:54 +02:00
Code Issues Releases Activity

Fix integer overflow when total resource amount is above (int max / 100)

Browse Source
This commit is contained in:
Ivan Savenko 2025-01-20 11:17:32 +00:00
parent 5064f6282a
commit 6b387e5d17
2 changed files with 13 additions and 8 deletions

6
lib/ResourceSet.cpp

@ -67,7 +67,11 @@ void ResourceSet::positive()
void ResourceSet::applyHandicap(int percentage)
{
for(auto & elem : *this)
elem = vstd::divideAndCeil(elem * percentage, 100);
{
int64_t newAmount = vstd::divideAndCeil(static_cast<int64_t>(elem) * percentage, 100);
int64_t cap = GameConstants::PLAYER_RESOURCES_CAP;
elem = std::min(cap, newAmount);
}
}
static bool canAfford(const ResourceSet &res, const ResourceSet &price)

15
server/processors/NewTurnProcessor.cpp

@ -258,13 +258,14 @@ ResourceSet NewTurnProcessor::generatePlayerIncome(PlayerColor playerID, bool ne
for (GameResID i : GameResID::ALL_RESOURCES())
{
const std::string & name = GameConstants::RESOURCE_NAMES[i];
int weeklyBonus = difficultyConfig[name].Integer();
int dayOfWeek = gameHandler->gameState()->getDate(Date::DAY_OF_WEEK);
int dailyIncome = incomeHandicapped[i];
int amountTillToday = dailyIncome * weeklyBonus * (dayOfWeek-1) / 7 / 100;
int amountAfterToday = dailyIncome * weeklyBonus * dayOfWeek / 7 / 100;
int dailyBonusToday = amountAfterToday - amountTillToday;
incomeHandicapped[static_cast<GameResID>(i)] += dailyBonusToday;
int64_t weeklyBonus = difficultyConfig[name].Integer();
int64_t dayOfWeek = gameHandler->gameState()->getDate(Date::DAY_OF_WEEK);
int64_t dailyIncome = incomeHandicapped[i];
int64_t amountTillToday = dailyIncome * weeklyBonus * (dayOfWeek-1) / 7 / 100;
int64_t amountAfterToday = dailyIncome * weeklyBonus * dayOfWeek / 7 / 100;
int64_t dailyBonusToday = amountAfterToday - amountTillToday;
int64_t totalIncomeToday = std::min(GameConstants::PLAYER_RESOURCES_CAP, incomeHandicapped[i] + dailyBonusToday);
incomeHandicapped[i] = totalIncomeToday;
}
}