Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

[Port to Release/2.0.0] Fix uaf in DestroyThread function #15444

Merged
merged 1 commit into from
Feb 12, 2018
Merged

[Port to Release/2.0.0] Fix uaf in DestroyThread function #15444

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: 6 additions & 6 deletions src/vm/threads.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,12 +987,6 @@ void DestroyThread(Thread *th)
#endif // _TARGET_X86_
#endif // WIN64EXCEPTIONS

if (g_fEEShutDown == 0)
{
th->SetThreadState(Thread::TS_ReportDead);
th->OnThreadTerminate(FALSE);
}

#ifdef FEATURE_PERFTRACING
// Before the thread dies, mark its buffers as no longer owned
// so that they can be cleaned up after the thread dies.
Expand All @@ -1002,6 +996,12 @@ void DestroyThread(Thread *th)
pBufferList->SetOwnedByThread(false);
}
#endif // FEATURE_PERFTRACING

if (g_fEEShutDown == 0)
{
th->SetThreadState(Thread::TS_ReportDead);
th->OnThreadTerminate(FALSE);
}
}

//-------------------------------------------------------------------------
Expand Down