Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorArsentiy Milchakov <milcars@mapswithme.com>2018-09-06 17:05:13 +0300
committerTatiana Yan <tatiana.kondakova@gmail.com>2018-09-06 17:47:16 +0300
commit0017ba8255bd57a7987f8241328e4200430bfcff (patch)
treee8dfb3b3a086e61d4e5f73428a4a1585ee19db1a /base
parentbed70cb44de69d9ce25cac72375464d3812eec09 (diff)
[base] worker thread out of bounds fix
Diffstat (limited to 'base')
-rw-r--r--base/worker_thread.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/base/worker_thread.cpp b/base/worker_thread.cpp
index 4846fed3b5..9c0bb41c59 100644
--- a/base/worker_thread.cpp
+++ b/base/worker_thread.cpp
@@ -58,7 +58,8 @@ void WorkerThread::ProcessTasks()
// while we are waiting.
auto const when = m_delayed.top().m_when;
m_cv.wait_until(lk, when, [this, when]() {
- return m_shutdown || !m_immediate.empty() || m_delayed.top().m_when < when;
+ return m_shutdown || !m_immediate.empty() || m_delayed.empty() ||
+ (!m_delayed.empty() && m_delayed.top().m_when < when);
});
}
else