Skip to content

bugfix(treebuffer): Fix crash in W3DTreeBuffer::updateVertexBuffer() #2526

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 3 commits into from
Apr 6, 2026
Merged

bugfix(treebuffer): Fix crash in W3DTreeBuffer::updateVertexBuffer() #2526

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3834d30
Fix W3DTreeBuffer crash due to stale vertex buffer indices
githubawn Apr 2, 2026
f407731
implemented technically correct suggestion from greptile
githubawn Apr 2, 2026
f91ae50
implemented review feedback
githubawn Apr 5, 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
11 changes: 10 additions & 1 deletion Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,10 @@ void W3DTreeBuffer::loadTreesInVertexAndIndexBuffers(RefRenderObjListIterator *p
Int curTree=0;
Int bNdx;
const GlobalData::TerrainLighting *objectLighting = TheGlobalData->m_terrainObjectsLighting[TheGlobalData->m_timeOfDay];
// TheSuperHackers @info Reset bufferNdx so updateVertexBuffer skips trees absent from this rebuild.
Comment thread
githubawn marked this conversation as resolved.
Outdated
for (Int t = 0; t < m_numTrees; t++) {
m_trees[t].bufferNdx = -1;
Comment thread
githubawn marked this conversation as resolved.
Outdated
}
for (bNdx=0; bNdx<MAX_BUFFERS; bNdx++) {
m_curNumTreeVertices[bNdx] = 0;
m_curNumTreeIndices[bNdx] = 0;
Expand Down Expand Up @@ -991,6 +995,10 @@ void W3DTreeBuffer::updateVertexBuffer()
DX8VertexBufferClass::WriteLockClass lockVtxBuffer(m_vertexTree[bNdx], D3DLOCK_DISCARD);
#endif
vb=(VertexFormatXYZNDUV1*)lockVtxBuffer.Get_Vertex_Array();
// TheSuperHackers @info Guard against a failed vertex buffer lock returning null.
Comment thread
githubawn marked this conversation as resolved.
Outdated
if (!vb) {
continue;
}
Comment thread
greptile-apps[bot] marked this conversation as resolved.

VertexFormatXYZNDUV1 *curVb;

Expand All @@ -1012,8 +1020,9 @@ void W3DTreeBuffer::updateVertexBuffer()
Vector3 loc = m_trees[curTree].location;
Real theSin = m_trees[curTree].sin;
Real theCos = m_trees[curTree].cos;
// TheSuperHackers @info Skip missing mesh trees to avoid using the wrong vertex count.
if (type<0 || m_treeTypes[type].m_mesh == nullptr) {
type = 0;
continue;
Comment thread
githubawn marked this conversation as resolved.
Outdated
}

Int startVertex = m_trees[curTree].firstIndex;
Expand Down
Loading