Skip to content

W3DTerrainTracks: Prevent crash when flushing after release #41

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

W3DTerrainTracks: Prevent crash when flushing after release #41

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
17 changes: 17 additions & 0 deletions Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTerrainTracks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,8 @@ void TerrainTracksRenderObjClassSystem::ReleaseResources(void)
{
REF_PTR_RELEASE(m_indexBuffer);
REF_PTR_RELEASE(m_vertexBuffer);
// Reset edge count to prevent flush() from attempting to use released resources
m_edgesToFlush = 0;
// Note - it is ok to not release the material, as it is a w3d object that
// has no dx8 resources. jba.
}
Expand Down Expand Up @@ -823,8 +825,23 @@ Try improving the fit to vertical surfaces like cliffs.
//check if there is anything to draw and fill vertex buffer
if (m_edgesToFlush >= 2)
{
// Validate that vertex buffer exists before attempting to lock it
if (!m_vertexBuffer)
{
m_edgesToFlush = 0;
return;
}

DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexBuffer);
VertexFormatXYZDUV1 *verts = (VertexFormatXYZDUV1*)lockVtxBuffer.Get_Vertex_Array();

// Validate that vertex array lock succeeded before writing to it
if (!verts)
{
m_edgesToFlush = 0;
return;
}

trackStartIndex=0;

mod=m_usedModules;
Expand Down