Fixed integer overflow

MeridianOXC · Dec 2, 2023 · 23e0ccc · 23e0ccc
1 parent c557bf0
commit 23e0ccc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/Basescape/ManufactureInfoState.cpp b/src/Basescape/ManufactureInfoState.cpp
@@ -575,13 +575,17 @@ void ManufactureInfoState::lessUnitClick(Action *action)
 		{
 			if (wasInfinite)
 			{
-				// when infinite amount is decreased by 1, set the amount to maximum possible considering current funds and store supplies
-				int productionPossible = INT_MAX;
+				// when infinite amount is decreased by 1, set the amount to maximum possible (capped at 999) considering current funds and store supplies
+				int productionPossible = 999;
 				auto* manufRule = _production->getRules();
 				if (manufRule->getManufactureCost() > 0)
 				{
-					int byFunds = _game->getSavedGame()->getFunds() / manufRule->getManufactureCost();
-					productionPossible = std::min(productionPossible, byFunds);
+					int64_t byFunds = _game->getSavedGame()->getFunds() / manufRule->getManufactureCost();
+					if (byFunds < 1000LL)
+					{
+						int byFundsInt = (int)byFunds;
+						productionPossible = std::min(productionPossible, byFundsInt);
+					}
 				}
 				for (auto& item : manufRule->getRequiredItems())
 				{

diff --git a/src/Basescape/NewManufactureListState.cpp b/src/Basescape/NewManufactureListState.cpp
@@ -407,8 +407,12 @@ void NewManufactureListState::fillProductionList(bool refreshCategories)
 			int productionPossible = 10; // max
 			if (manuf->getManufactureCost() > 0)
 			{
-				int byFunds = _game->getSavedGame()->getFunds() / manuf->getManufactureCost();
-				productionPossible = std::min(productionPossible, byFunds);
+				int64_t byFunds = _game->getSavedGame()->getFunds() / manuf->getManufactureCost();
+				if (byFunds < 10LL)
+				{
+					int byFundsInt = (int)byFunds;
+					productionPossible = std::min(productionPossible, byFundsInt);
+				}
 			}
 			for (auto& iter : manuf->getRequiredItems())
 			{