Skip to content

bugfix(controlbar): Fix possible divisions by zero in Control Bar code #2867

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Caball009 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bugfix(controlbar): Fix possible divisions by zero in Control Bar code #2867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Core/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,7 @@ void ControlBar::populatePurchaseScience( Player* player )
win = TheWindowManager->winGetWindowFromId( m_contextParent[ CP_PURCHASE_SCIENCE ], TheNameKeyGenerator->nameToKey( "GeneralsExpPoints.wnd:ProgressBarExperience" ) );
if(win)
{
Int progress;
progress = ((player->getSkillPoints() - player->getSkillPointsLevelDown()) * 100) /(player->getSkillPointsLevelUp() - player->getSkillPointsLevelDown());
const Int progress = ((player->getSkillPoints() - player->getSkillPointsLevelDown()) * 100) / (player->getSkillPointsLevelUp() - player->getSkillPointsLevelDown());
GadgetProgressBarSetProgress(win, progress);
}

Expand Down Expand Up @@ -483,8 +482,7 @@ void ControlBar::updateContextPurchaseScience()
win = TheWindowManager->winGetWindowFromId( m_contextParent[ CP_PURCHASE_SCIENCE ], TheNameKeyGenerator->nameToKey( "GeneralsExpPoints.wnd:ProgressBarExperience" ) );
if(win)
{
Int progress;
progress = ((player->getSkillPoints() - player->getSkillPointsLevelDown()) * 100) /(player->getSkillPointsLevelUp() - player->getSkillPointsLevelDown());
const Int progress = ((player->getSkillPoints() - player->getSkillPointsLevelDown()) * 100) / (player->getSkillPointsLevelUp() - player->getSkillPointsLevelDown());
GadgetProgressBarSetProgress(win, progress);
}

Expand Down
8 changes: 1 addition & 7 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,14 +477,8 @@ void W3DCommandBarGenExpDraw( GameWindow *window, WinInstanceData *instData )
static const Image *endBar = TheMappedImageCollection->findImageByName("GenExpBarTop1");
static const Image *beginBar = TheMappedImageCollection->findImageByName("GenExpBarBottom1");
static const Image *centerBar = TheMappedImageCollection->findImageByName("GenExpBar1");
Int progress = 0;
Int skillPointsRequired = player->getSkillPointsLevelUp() - player->getSkillPointsLevelDown();

// TheSuperHackers @bugfix Mauller 04/05/2025 Prevent possible division by zero
if ( skillPointsRequired > 0)
{
progress = ( ((player->getSkillPoints() - player->getSkillPointsLevelDown()) * 100) / skillPointsRequired );
}
Int progress = ((player->getSkillPoints() - player->getSkillPointsLevelDown()) * 100) / (player->getSkillPointsLevelUp() - player->getSkillPointsLevelDown());

if(progress <= 0)
return;
Expand Down
15 changes: 15 additions & 0 deletions Generals/Code/GameEngine/Source/Common/RTS/Player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2593,6 +2593,13 @@ void Player::resetRank()
m_skillPoints = 0;
const RankInfo* nextRank = TheRankInfoStore->getRankInfo(m_rankLevel+1);
m_levelUp = nextRank ? nextRank->m_skillPointsNeeded : INT_MAX;

// TheSuperHackers @bugfix Prevent possible division by zero in the control bar code.
if (m_levelUp == 0)
{
m_levelUp = INT_MAX;
}

m_levelDown = 0;
m_sciences.clear();
m_sciencePurchasePoints = getPlayerTemplate() ? getPlayerTemplate()->getIntrinsicSciencePurchasePoints() : 0;
Expand Down Expand Up @@ -2653,6 +2660,14 @@ Bool Player::setRankLevel(Int newLevel)

const RankInfo* nextRank = TheRankInfoStore->getRankInfo(newLevel + 1);
m_levelUp = nextRank ? nextRank->m_skillPointsNeeded : INT_MAX;

// TheSuperHackers @bugfix Prevent possible division by zero in the control bar code.
if (m_levelUp - m_levelDown == 0)
{
m_levelUp = INT_MAX;
m_levelDown = 0;
}

m_rankLevel = newLevel;

DEBUG_ASSERTCRASH(m_skillPoints >= m_levelDown && m_skillPoints < m_levelUp, ("hmm, wrong"));
Expand Down
15 changes: 15 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/RTS/Player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2703,6 +2703,13 @@ void Player::resetRank()
m_skillPoints = 0;
const RankInfo* nextRank = TheRankInfoStore->getRankInfo(m_rankLevel+1);
m_levelUp = nextRank ? nextRank->m_skillPointsNeeded : INT_MAX;

// TheSuperHackers @bugfix Prevent possible division by zero in the control bar code.
if (m_levelUp == 0)
{
m_levelUp = INT_MAX;
}

m_levelDown = 0;
m_sciences.clear();
m_sciencePurchasePoints = getPlayerTemplate() ? getPlayerTemplate()->getIntrinsicSciencePurchasePoints() : 0;
Expand Down Expand Up @@ -2763,6 +2770,14 @@ Bool Player::setRankLevel(Int newLevel)

const RankInfo* nextRank = TheRankInfoStore->getRankInfo(newLevel + 1);
m_levelUp = nextRank ? nextRank->m_skillPointsNeeded : INT_MAX;

// TheSuperHackers @bugfix Prevent possible division by zero in the control bar code.
if (m_levelUp - m_levelDown == 0)
{
m_levelUp = INT_MAX;
m_levelDown = 0;
}

m_rankLevel = newLevel;

DEBUG_ASSERTCRASH(m_skillPoints >= m_levelDown && m_skillPoints < m_levelUp, ("hmm, wrong"));
Expand Down
Loading