Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

SafeThread: Avoid use-after-free risk in thread shutdown (#1355)

Browse Source 
Use shared_ptr to keep data alive until the thread has terminated.
This commit is contained in:
Peter Johnson
2018-10-05 16:32:43 -07:00
committed by GitHub
parent 36000ddb36
commit 18c8cce6a7
8 changed files with 103 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cscore/src/main/native/cpp/MjpegServerImpl.cpp
View File

@@ -865,10 +865,7 @@ void MjpegServerImpl::ServerThreadMain() {
}
// Start it if not already started
{
auto thr = it->GetThread();
if (!thr) it->Start(new ConnThread{GetName()});
}
it->Start(GetName());
auto nstreams =
std::count_if(m_connThreads.begin(), m_connThreads.end(),

5
cscore/src/main/native/cpp/Notifier.cpp
View File

@@ -94,10 +94,7 @@ Notifier::Notifier() { s_destroyed = false; }
Notifier::~Notifier() { s_destroyed = true; }
void Notifier::Start() {
auto thr = m_owner.GetThread();
if (!thr) m_owner.Start(new Thread(m_on_start, m_on_exit));
}
void Notifier::Start() { m_owner.Start(m_on_start, m_on_exit); }
void Notifier::Stop() { m_owner.Stop(); }

5
cscore/src/main/native/cpp/Telemetry.cpp
View File

@@ -45,10 +45,7 @@ Telemetry::Telemetry() {}
Telemetry::~Telemetry() {}
void Telemetry::Start() {
auto thr = m_owner.GetThread();
if (!thr) m_owner.Start(new Thread);
}
void Telemetry::Start() { m_owner.Start(); }
void Telemetry::Stop() { m_owner.Stop(); }