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

Fix #908, use empty coroutine to avoid NULL pointer.

Browse source
This commit is contained in:
winlin 2017-06-04 19:13:56 +08:00
parent 0e9e1792fe
commit 9ca36970aa
17 changed files with 115 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

9
trunk/src/app/srs_app_edge.cpp
View file

@ -166,7 +166,7 @@ SrsEdgeIngester::SrsEdgeIngester()
upstream = new SrsEdgeRtmpUpstream(redirect);
lb = new SrsLbRoundRobin();
trd = NULL;
trd = new SrsDummyCoroutine();
}
SrsEdgeIngester::~SrsEdgeIngester()
@ -199,7 +199,7 @@ int SrsEdgeIngester::start()
}
srs_freep(trd);
trd = new SrsCoroutine("edge-igs", this);
trd = new SrsSTCoroutine("edge-igs", this);
return trd->start();
}
@ -423,7 +423,7 @@ SrsEdgeForwarder::SrsEdgeForwarder()
sdk = NULL;
lb = new SrsLbRoundRobin();
trd = NULL;
trd = new SrsDummyCoroutine();
queue = new SrsMessageQueue();
}
@ -493,7 +493,8 @@ int SrsEdgeForwarder::start()
return ret;
}
trd = new SrsCoroutine("edge-fwr", this);
srs_freep(trd);
trd = new SrsSTCoroutine("edge-fwr", this);
return trd->start();
}