Skip to content

DX8Renderer: Prevent list corruption during DX8TextureCategoryClass destruction #136

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
+20 −2
Open

DX8Renderer: Prevent list corruption during DX8TextureCategoryClass destruction #136

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
11 changes: 10 additions & 1 deletion Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,17 @@ DX8TextureCategoryClass::DX8TextureCategoryClass(

DX8TextureCategoryClass::~DX8TextureCategoryClass()
{
// Clear texture_category pointer for all polygon renderers first to prevent them from
// trying to remove themselves from PolygonRendererList during destruction (which would
// cause list corruption while we're iterating)
DX8PolygonRendererListIterator it(&PolygonRendererList);
while (!it.Is_Done()) {
it.Peek_Obj()->Set_Texture_Category(NULL);
it.Next();
}

// Unregistering the mesh where polygon renderers are connected to kills all polygon renderers
while (DX8PolygonRendererClass* p_renderer=PolygonRendererList.Get_Head()) {
while (DX8PolygonRendererClass* p_renderer=PolygonRendererList.Remove_Head()) {
TheDX8MeshRenderer.Unregister_Mesh_Type(p_renderer->Get_Mesh_Model_Class());
}
for (int a=0;a<MAX_TEXTURE_STAGES;++a) {
Expand Down
11 changes: 10 additions & 1 deletion GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,17 @@ DX8TextureCategoryClass::DX8TextureCategoryClass(

DX8TextureCategoryClass::~DX8TextureCategoryClass()
{
// Clear texture_category pointer for all polygon renderers first to prevent them from
// trying to remove themselves from PolygonRendererList during destruction (which would
// cause list corruption while we're iterating)
DX8PolygonRendererListIterator it(&PolygonRendererList);
while (!it.Is_Done()) {
it.Peek_Obj()->Set_Texture_Category(NULL);
it.Next();
}

// Unregistering the mesh where polygon renderers are connected to kills all polygon renderers
while (DX8PolygonRendererClass* p_renderer=PolygonRendererList.Get_Head()) {
while (DX8PolygonRendererClass* p_renderer=PolygonRendererList.Remove_Head()) {
TheDX8MeshRenderer.Unregister_Mesh_Type(p_renderer->Get_Mesh_Model_Class());
}
for (int a=0;a<MeshMatDescClass::MAX_TEX_STAGES;++a)
Expand Down
Loading