Skip to content

BaseHeightMap: Add null check for m_map before dereferencing #46

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
x64-dev merged 1 commit into from
Oct 10, 2025
Merged

BaseHeightMap: Add null check for m_map before dereferencing #46

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
8 changes: 8 additions & 0 deletions GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2461,6 +2461,10 @@ void BaseHeightMapRenderObjClass::renderShoreLines(CameraClass *pCamera)
if (DX8Wrapper::getBackBufferFormat() != WW3D_FORMAT_A8R8G8B8)
return; //can't apply effect on cards without destination alpha

// Safety check: ensure m_map is valid before dereferencing
if (!m_map)
return;

Int vertexCount = 0;
Int indexCount = 0;
Int drawEdgeY=m_map->getDrawOrgY()+m_map->getDrawHeight()-1;
Expand Down Expand Up @@ -2624,6 +2628,10 @@ void BaseHeightMapRenderObjClass::renderShoreLinesSorted(CameraClass *pCamera)
if (DX8Wrapper::getBackBufferFormat() != WW3D_FORMAT_A8R8G8B8)
return; //can't apply effect on cards without destination alpha

// Safety check: ensure m_map is valid before dereferencing
if (!m_map)
return;

Int vertexCount = 0;
Int indexCount = 0;
Int drawEdgeY=m_map->getDrawOrgY()+m_map->getDrawHeight()-1;
Expand Down
Loading