Skip to content

Commit 12519bf

Browse files
committed
test: Fix use-after-free in scheduler tests
Make a copy of the boost time-point to wait for, otherwise the head of the queue may be deleted by another thread while this one is waiting, while the boost function still has a reference to it. Although this problem is in non-test code, this is not an actual problem outside of the tests because we use the thread scheduler with only one service thread, so there will never be threads fighting at the head of the queue. The old boost fallback escapes this problem because it passes a scalar value to wait_until instead of a const object reference. Found by running the tests in LLVM-4.0-master asan.
1 parent a8b2a82 commit 12519bf

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/scheduler.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,10 @@ void CScheduler::serviceQueue()
5454
#else
5555
// Some boost versions have a conflicting overload of wait_until that returns void.
5656
// Explicitly use a template here to avoid hitting that overload.
57-
while (!shouldStop() && !taskQueue.empty() &&
58-
newTaskScheduled.wait_until<>(lock, taskQueue.begin()->first) != boost::cv_status::timeout) {
59-
// Keep waiting until timeout
57+
while (!shouldStop() && !taskQueue.empty()) {
58+
boost::chrono::system_clock::time_point timeToWaitFor = taskQueue.begin()->first;
59+
if (newTaskScheduled.wait_until<>(lock, timeToWaitFor) == boost::cv_status::timeout)
60+
break; // Exit loop after timeout, it means we reached the time of the event
6061
}
6162
#endif
6263
// If there are multiple threads, the queue can empty while we're waiting (another

0 commit comments

Comments
 (0)