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

3
ntcore/src/main/native/cpp/CallbackManager.h
View File

@@ -294,8 +294,7 @@ class CallbackManager {
protected:
template <typename... Args>
void DoStart(Args&&... args) {
auto thr = m_owner.GetThread();
if (!thr) m_owner.Start(new Thread(std::forward<Args>(args)...));
m_owner.Start(std::forward<Args>(args)...);
}
template <typename... Args>

2
ntcore/src/main/native/cpp/DsClient.cpp
View File

@@ -36,7 +36,7 @@ DsClient::DsClient(Dispatcher& dispatcher, wpi::Logger& logger)
void DsClient::Start(unsigned int port) {
auto thr = m_owner.GetThread();
if (!thr)
m_owner.Start(new Thread(m_dispatcher, m_logger, port));
m_owner.Start(m_dispatcher, m_logger, port);
else
thr->m_port = port;
}