mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix data race loading next thumbnail without locking the item

Browse Source 
This was detected with -fsanitize=thread
This commit is contained in:
David Capello 2022-04-19 17:09:49 -03:00
parent 03e0bc26c9
commit f0a7d1faaa
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/thumbnail_generator.cpp
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2019-2020 Igara Studio S.A.
// Copyright (C) 2019-2022 Igara Studio S.A.
// Copyright (C) 2001-2018 David Capello
//
// This program is distributed under the terms of
@ -199,8 +199,14 @@ private:
void loadBgThread() {
while (!m_queue.empty()) {
while (m_queue.try_pop(m_item)) {
loadItem();
bool success = true;
while (success) {
{
base::scoped_lock lock(m_mutex); // To access m_item
success = m_queue.try_pop(m_item);
}
if (success)
loadItem();
}
base::this_thread::yield();
}