jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

scheduled_executor: prevent use-after-free in reschedule

Browse Source 
Change-Id: Id9fe8099cc0e82845e2a2d1cb4c4128f281ba982
This commit is contained in:
Adrien Béraud
2022-06-22 15:47:22 -04:00
parent fa7fb8beb0
commit 5574e5f6ee
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/scheduled_executor.cpp
View File

@ -55,11 +55,9 @@ ScheduledExecutor::~ScheduledExecutor()
void
ScheduledExecutor::stop()
{
{
std::lock_guard<std::mutex> lock(jobLock_);
*running_ = false;
jobs_.clear();
}
std::lock_guard<std::mutex> lock(jobLock_);
*running_ = false;
jobs_.clear();
cv_.notify_all();
}
@ -67,11 +65,9 @@ void
ScheduledExecutor::run(std::function<void()>&& job,
const char* filename, uint32_t linum)
{
{
std::lock_guard<std::mutex> lock(jobLock_);
auto now = clock::now();
jobs_[now].emplace_back(std::move(job), filename, linum);
}
std::lock_guard<std::mutex> lock(jobLock_);
auto now = clock::now();
jobs_[now].emplace_back(std::move(job), filename, linum);
cv_.notify_all();
}
@ -115,11 +111,11 @@ ScheduledExecutor::reschedule(std::shared_ptr<RepeatedTask> task, time_point t,
void
ScheduledExecutor::schedule(std::shared_ptr<Task> task, time_point t)
{
{
std::lock_guard<std::mutex> lock(jobLock_);
jobs_[t].emplace_back([task = std::move(task), this] { task->run(name_.c_str()); },
task->job().filename, task->job().linum);
}
const char* filename = task->job().filename;
uint32_t linenum = task->job().linum;
std::lock_guard<std::mutex> lock(jobLock_);
jobs_[t].emplace_back([task = std::move(task), this] { task->run(name_.c_str()); },
filename, linenum);
cv_.notify_all();
}