Skip to content

bugfix(w3dmouse): Prevent race conditions and use-after-free during shutdown #488

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
May 7, 2026
+15 −4
Merged

bugfix(w3dmouse): Prevent race conditions and use-after-free during shutdown #488

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
19 changes: 15 additions & 4 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DMouse.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,15 @@ void MouseThreadClass::Thread_Function()
while (running)
{
isThread = TRUE;
if (TheMouse)
TheMouse->draw();
// Hold the mutex for the TheMouse check AND the draw() call together so
// that TheMouse cannot be destroyed between the null-check and the actual
// dereference. CriticalSectionClass uses a Windows CRITICAL_SECTION which
// is re-entrant per-thread, so the nested acquisition inside draw() is safe.
{
CriticalSectionClass::LockClass m(mutex);
if (TheMouse)
TheMouse->draw();
}
isThread = FALSE;
Switch_Thread();
}
Expand Down Expand Up @@ -108,6 +115,12 @@ W3DMouse::W3DMouse()

W3DMouse::~W3DMouse()
{
// Stop the mouse update thread FIRST, before freeing any assets it may be
// actively using. If the thread is mid-draw(), Stop() will wait for it to
// finish before returning, preventing a use-after-free when we release
// D3D/W3D resources below.
thread.Stop();

LPDIRECT3DDEVICE8 m_pDev = DX8Wrapper::_Get_D3D_Device8();

if (m_pDev)
Expand All @@ -119,8 +132,6 @@ W3DMouse::~W3DMouse()
freeD3DAssets();
freeW3DAssets();

thread.Stop();

}

void W3DMouse::initPolygonAssets()
Expand Down
Loading