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

修复WebApi退出清理时重复析构问题 (#2900)

Browse Source 
1. s_???Map.clear()会触发key/value的析构，先执行析构再移除map成员。析构执行完之前map成员仍然有可见性。
2. s_???Map的成员析构时，根据当前状态，可能触发回调，如播放终止回调。
3. 在状态变更的回调函数中，通过s_???Map.erase(key)的方式解注册，此时也会触发一次析构。

两次析构导致double free：a) map.erase, b) map.clear

Signed-off-by: ArmstrongCN <armstrong@sweelia.com>
This commit is contained in:
Armstrong 2023-10-13 15:26:31 +08:00 committed by GitHub
parent eedf262059
commit b8cb8957e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/WebApi.cpp
View File

@ -1911,24 +1911,28 @@ void installWebApi() {
void unInstallWebApi(){ void unInstallWebApi(){
{ {
lock_guard<recursive_mutex> lck(s_proxyMapMtx); lock_guard<recursive_mutex> lck(s_proxyMapMtx);
s_proxyMap.clear(); auto proxyMap(std::move(s_proxyMap));
proxyMap.clear();
} }
{ {
lock_guard<recursive_mutex> lck(s_ffmpegMapMtx); lock_guard<recursive_mutex> lck(s_ffmpegMapMtx);
s_ffmpegMap.clear(); auto ffmpegMap(std::move(s_ffmpegMap));
ffmpegMap.clear();
} }
{ {
lock_guard<recursive_mutex> lck(s_proxyPusherMapMtx); lock_guard<recursive_mutex> lck(s_proxyPusherMapMtx);
s_proxyPusherMap.clear(); auto proxyPusherMap(std::move(s_proxyPusherMap));
proxyPusherMap.clear();
} }
{ {
#if defined(ENABLE_RTPPROXY) #if defined(ENABLE_RTPPROXY)
RtpSelector::Instance().clear(); RtpSelector::Instance().clear();
lock_guard<recursive_mutex> lck(s_rtpServerMapMtx); lock_guard<recursive_mutex> lck(s_rtpServerMapMtx);
s_rtpServerMap.clear(); auto rtpServerMap(std::move(s_rtpServerMap));
rtpServerMap.clear();
#endif #endif
} }
NoticeCenter::Instance().delListener(&web_api_tag); NoticeCenter::Instance().delListener(&web_api_tag);