R3944Realms/srs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clear disposing then free resources to avoid reuse addresses

Browse Source
This commit is contained in:
winlin 2020-12-21 12:05:56 +08:00
parent e8fa92e3d1
commit 764909c6cf
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
trunk/src/app/srs_app_conn.cpp
View File

@ -261,9 +261,6 @@ void SrsResourceManager::clear()
} }
do_clear(); do_clear();
// Reset it for it points to a local object.
p_disposing_ = NULL;
} }
void SrsResourceManager::do_clear() void SrsResourceManager::do_clear()
@ -286,6 +283,11 @@ void SrsResourceManager::do_clear()
dispose(conn); dispose(conn);
} }
// Reset it for it points to a local object.
// @remark We must set the disposing to NULL to avoid reusing address,
// because the context might switch.
p_disposing_ = NULL;
// We should free the resources when finished all disposing callbacks, // We should free the resources when finished all disposing callbacks,
// which might cause context switch and reuse the freed addresses. // which might cause context switch and reuse the freed addresses.
for (int i = 0; i < (int)copy.size(); i++) { for (int i = 0; i < (int)copy.size(); i++) {