hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix segfault in RTMP output when attempting to play a non-existent stream

Browse source
This commit is contained in:
Thulinma 2020-06-11 19:26:24 +02:00
parent 280743051a
commit cfe85b41f0
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/output/output_rtmp.cpp
View file

@ -965,6 +965,22 @@ namespace Mist{
} }
initialize(); initialize();
//Abort if stream could not be opened
if (!M){
INFO_MSG("Could not open stream, aborting");
// send a _result reply
AMF::Object amfReply("container", AMF::AMF0_DDV_CONTAINER);
amfReply.addContent(AMF::Object("", "_error")); // result success
amfReply.addContent(amfData.getContent(1)); // same transaction ID
amfReply.addContent(AMF::Object("", (double)0, AMF::AMF0_NULL)); // null - command info
amfReply.addContent(AMF::Object("")); // info
amfReply.getContentP(3)->addContent(AMF::Object("code", "NetStream.Play.Rejected"));
amfReply.getContentP(3)->addContent(
AMF::Object("description", "Play rejected: could not initialize stream"));
sendCommand(amfReply, messageType, streamId);
onFinish();
return;
}
// send a status reply // send a status reply
AMF::Object amfreply("container", AMF::AMF0_DDV_CONTAINER); AMF::Object amfreply("container", AMF::AMF0_DDV_CONTAINER);