Skip to content

fix double free in action pool #466

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

Merged
BartolomeyKant merged 1 commit into from
May 27, 2026
Merged

fix double free in action pool #466

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
17 changes: 12 additions & 5 deletions aether/actions/action_pool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,11 @@ class ActionPool : public etl::pool<T, Capacity> {

private:
void Destroy(T* p) {
ac_.scheduler().Task([&, p]() { base_t::template destroy<T>(p); });
ts_ = ac_.scheduler().Task([&, p]() { base_t::template destroy<T>(p); });
}

AC ac_;
TaskSubscription ts_;
};

template <ActionContext AC, typename... T, std::size_t Capacity>
Expand All @@ -74,6 +75,12 @@ class ActionPool<AC, std::variant<T...>, Capacity>
using base_t = etl::variant_pool<Capacity, T...>;

constexpr explicit ActionPool(AC const& ac) noexcept : ac_{ac} {}
~ActionPool() noexcept {
for (auto i = base_t::begin(); i != base_t::end(); ++i) {
// destroy each element as an Action
base_t::destroy(&i.template get<Action>());
}
}

template <typename U, typename... Args>
requires(std::is_same_v<U, T> || ...)
Expand All @@ -82,18 +89,18 @@ class ActionPool<AC, std::variant<T...>, Capacity>
if (p != nullptr) {
// destroy on finish
static_cast<Action*>(p)->finished_event().Subscribe(
[this, p]() { Destroy<U>(p); });
[this, p_ = static_cast<Action*>(p)]() { Destroy(p_); });
}
return p;
}

private:
template <typename U>
void Destroy(U* p) {
ac_.scheduler().Task([&, p]() { base_t::template destroy<U>(p); });
void Destroy(Action* p) {
ts_ = ac_.scheduler().Task([&, p]() { base_t::destroy(p); });
}

AC ac_;
TaskSubscription ts_;
};
} // namespace ae

Expand Down