external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge from SRS2.

Browse source
This commit is contained in:
winlin 2017-04-15 17:09:50 +08:00
commit d6e28bde69
3 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
trunk/src/app/srs_app_caster_flv.cpp
View file

@ -91,6 +91,11 @@ void SrsAppCasterFlv::remove(ISrsConnection* c)
if ((it = std::find(conns.begin(), conns.end(), conn)) != conns.end()) {
conns.erase(it);
}
// fixbug: SrsHttpConn for CasterFlv is not freed, which could cause memory leak
// so, free conn which is not managed by SrsServer->conns;
// @see: https://github.com/ossrs/srs/issues/826
srs_freep(c);
}
int SrsAppCasterFlv::serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)