AuroraMiddleware/asio
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clear the heap index for removed timers.

Browse Source 
Fixes timer heap corruption that can occur after move assignment of
a cancelled timer.
This commit is contained in:
Christopher Kohlhoff 2018-11-05 12:32:58 +11:00
parent 68df16d560
commit ff28c6f777
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asio/include/asio/detail/timer_queue.hpp
View File

@ -266,11 +266,13 @@ private:
{
if (index == heap_.size() - 1)
{
timer.heap_index_ = (std::numeric_limits<std::size_t>::max)();
heap_.pop_back();
}
else
{
swap_heap(index, heap_.size() - 1);
timer.heap_index_ = (std::numeric_limits<std::size_t>::max)();
heap_.pop_back();
if (index > 0 && Time_Traits::less_than(
heap_[index].time_, heap_[(index - 1) / 2].time_))