amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

bugfix: 修复所有Player的删除器使用同一个线程进行析构导致崩溃的问题 (#3672)

Browse Source 
Player的删除器release_func是static类型，weak_poller不会更新了。后面析构使用的就不是正确的poller线程了。
This commit is contained in:
sgzed 2024-06-28 12:43:56 +08:00 committed by xia-chu
parent 5a717186dd
commit cf6066b36e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Player/PlayerBase.cpp
View File

@ -24,7 +24,7 @@ namespace mediakit {
PlayerBase::Ptr PlayerBase::createPlayer(const EventPoller::Ptr &in_poller, const string &url_in) { PlayerBase::Ptr PlayerBase::createPlayer(const EventPoller::Ptr &in_poller, const string &url_in) {
auto poller = in_poller ? in_poller : EventPollerPool::Instance().getPoller(); auto poller = in_poller ? in_poller : EventPollerPool::Instance().getPoller();
std::weak_ptr<EventPoller> weak_poller = poller; std::weak_ptr<EventPoller> weak_poller = poller;
static auto release_func = [weak_poller](PlayerBase *ptr) { auto release_func = [weak_poller](PlayerBase *ptr) {
if (auto poller = weak_poller.lock()) { if (auto poller = weak_poller.lock()) {
poller->async([ptr]() { poller->async([ptr]() {
onceToken token(nullptr, [&]() { delete ptr; }); onceToken token(nullptr, [&]() { delete ptr; });