Skip to content

HeightMap: Add safety check for vertex buffer arrays before access #123

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
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

HeightMap: Add safety check for vertex buffer arrays before access #123

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
5 changes: 5 additions & 0 deletions Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1154,6 +1154,11 @@ Int HeightMapRenderObjClass::updateBlock(Int x0, Int y0, Int x1, Int y1, WorldH
REF_PTR_SET(m_stageOneTexture, pMap->getAlphaTerrainTexture());
}

// Validate vertex buffer arrays before access to prevent race condition during resource cleanup
if (!m_vertexBufferTiles || !m_vertexBufferBackup) {
return -1;
}

Int i,j;
DX8VertexBufferClass **pVB;
Int originX,originY;
Expand Down
5 changes: 5 additions & 0 deletions GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/HeightMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,6 +1024,11 @@ Int HeightMapRenderObjClass::updateBlock(Int x0, Int y0, Int x1, Int y1, WorldH
REF_PTR_SET(m_stageOneTexture, pMap->getAlphaTerrainTexture());
}

// Validate vertex buffer arrays before access to prevent race condition during resource cleanup
if (!m_vertexBufferTiles || !m_vertexBufferBackup) {
return -1;
}

Int i,j;
DX8VertexBufferClass **pVB;
Int originX,originY;
Expand Down
Loading