Skip to content

Fix potential bug with incorrect recycling of block of memory across dll boundary #728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
olologin wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −3
Open

Fix potential bug with incorrect recycling of block of memory across dll boundary #728

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions taskflow/utility/object_pool.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ class ObjectPool {

struct Block {
std::atomic<LocalHeap*> heap;
GlobalHeap* g_heap;
Blocklist list_node;
size_t i;
size_t u;
Expand Down Expand Up @@ -626,6 +627,7 @@ T* ObjectPool<T, S>::animate(ArgsT&&... args) {
s = new Block();

s->heap = &h;
s->g_heap = &_gheap;
s->i = 0;
s->u = 0;
s->top = nullptr;
Expand Down Expand Up @@ -695,7 +697,7 @@ void ObjectPool<T, S>::recycle(T* mem) {

// the block is in global heap
if(h == nullptr) {
std::lock_guard<std::mutex> glock(_gheap.mutex);
std::lock_guard<std::mutex> glock(s->g_heap->mutex);
if(s->heap == h) {
sync = true;
_deallocate(s, mem);
Expand Down Expand Up @@ -729,8 +731,8 @@ void ObjectPool<T, S>::recycle(T* mem) {
h->u = h->u - x->u;
h->a = h->a - M;
x->heap = nullptr;
std::lock_guard<std::mutex> glock(_gheap.mutex);
_blocklist_move_front(&x->list_node, &_gheap.list);
std::lock_guard<std::mutex> glock(s->g_heap->mutex);
_blocklist_move_front(&x->list_node, &s->g_heap.list);
break;
}
}
Expand Down