Skip to content

DX8Renderer: Prevent use-after-free in DX8TextureCategoryClass destructor #98

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 −4
Open

DX8Renderer: Prevent use-after-free in DX8TextureCategoryClass destructor #98

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
12 changes: 10 additions & 2 deletions 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,9 +210,17 @@ DX8TextureCategoryClass::DX8TextureCategoryClass(

DX8TextureCategoryClass::~DX8TextureCategoryClass()
{
// Clear texture_category pointers from all polygon renderers to prevent use-after-free
// when they are deleted during Unregister_Mesh_Type
DX8PolygonRendererClass* p_renderer = PolygonRendererList.Get_Head();
while (p_renderer) {
p_renderer->Set_Texture_Category(NULL);
p_renderer = PolygonRendererList.Get_Next(p_renderer);
}

// Unregistering the mesh where polygon renderers are connected to kills all polygon renderers
while (DX8PolygonRendererClass* p_renderer=PolygonRendererList.Get_Head()) {
TheDX8MeshRenderer.Unregister_Mesh_Type(p_renderer->Get_Mesh_Model_Class());
while (DX8PolygonRendererClass* renderer=PolygonRendererList.Get_Head()) {
TheDX8MeshRenderer.Unregister_Mesh_Type(renderer->Get_Mesh_Model_Class());
}
for (int a=0;a<MAX_TEXTURE_STAGES;++a) {
REF_PTR_RELEASE(textures[a]);
Expand Down
12 changes: 10 additions & 2 deletions 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,9 +212,17 @@

DX8TextureCategoryClass::~DX8TextureCategoryClass()
{
// Clear texture_category pointers from all polygon renderers to prevent use-after-free
// when they are deleted during Unregister_Mesh_Type
DX8PolygonRendererClass* p_renderer = PolygonRendererList.Get_Head();
while (p_renderer) {
p_renderer->Set_Texture_Category(NULL);
p_renderer = PolygonRendererList.Get_Next(p_renderer);

Check failure on line 220 in GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-profile+e 

 'Get_Next': is not a member of 'MultiListClass<DX8PolygonRendererClass>'

Check failure on line 220 in GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32+e 

 'Get_Next': is not a member of 'MultiListClass<DX8PolygonRendererClass>'

Check failure on line 220 in GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-debug+e 

 'Get_Next': is not a member of 'MultiListClass<DX8PolygonRendererClass>'
}

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