Skip to content

fix(controlbar): Prevent null dereference in ControlBar::showRallyPoint() if RallyPointMarker was not defined in INI #3304

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

Merged
xezon merged 4 commits into from
Sep 17, 2026
+7 −5
Merged

fix(controlbar): Prevent null dereference in ControlBar::showRallyPoint() if RallyPointMarker was not defined in INI #3304

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b83014
fix(ControlBar): Return if `marker` is null.
CryoTheRenegade Sep 16, 2026
e172534
fix(ControlBar): Add Invalid ID suggestion
CryoTheRenegade Sep 16, 2026
3919be4
fix(ControlBar): Check the rally point template before creation
CryoTheRenegade Sep 16, 2026
2880cfd
style(ControlBar): Remove redundant rally point comment
CryoTheRenegade Sep 16, 2026
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
12 changes: 7 additions & 5 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 @@ -2741,13 +2741,15 @@ void ControlBar::showRallyPoint(const Coord3D* loc)
if (m_rallyPointDrawableID == INVALID_DRAWABLE_ID)
{
const ThingTemplate* ttn = TheThingFactory->findTemplate("RallyPointMarker");
marker = TheThingFactory->newDrawable(ttn);
DEBUG_ASSERTCRASH(marker, ("showRallyPoint: Unable to create rally point drawable"));
if (marker)
if (!ttn)
{
marker->setDrawableStatus(DRAWABLE_STATUS_NO_SAVE);
m_rallyPointDrawableID = marker->getID();
return;
}

marker = TheThingFactory->newDrawable(ttn);
DEBUG_ASSERTCRASH(marker, ("showRallyPoint: Unable to create rally point drawable"));
marker->setDrawableStatus(DRAWABLE_STATUS_NO_SAVE);
m_rallyPointDrawableID = marker->getID();
Comment thread
CryoTheRenegade marked this conversation as resolved.
}
else
marker = TheGameClient->findDrawableByID(m_rallyPointDrawableID);
Expand Down
Loading