RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 17:32:06 +00:00
Code Issues Projects Releases Wiki Activity

avformat/rtmpproto: send proper status for response to play command

Browse Source 
This fixes referencing the uninitialized filename variable.

Fixes ticket #9711.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2022-04-14 22:40:28 +02:00
parent 58aa06bea0
commit 58454749a7
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/rtmpproto.c
View File

@ -1857,11 +1857,10 @@ static int write_begin(URLContext *s)
} }
static int write_status(URLContext *s, RTMPPacket *pkt, static int write_status(URLContext *s, RTMPPacket *pkt,
const char *status, const char *filename) const char *status, const char *description, const char *details)
{ {
RTMPContext *rt = s->priv_data; RTMPContext *rt = s->priv_data;
RTMPPacket spkt = { 0 }; RTMPPacket spkt = { 0 };
char statusmsg[128];
uint8_t *pp; uint8_t *pp;
int ret; int ret;
@ -1884,11 +1883,11 @@ static int write_status(URLContext *s, RTMPPacket *pkt,
ff_amf_write_field_name(&pp, "code"); ff_amf_write_field_name(&pp, "code");
ff_amf_write_string(&pp, status); ff_amf_write_string(&pp, status);
ff_amf_write_field_name(&pp, "description"); ff_amf_write_field_name(&pp, "description");
snprintf(statusmsg, sizeof(statusmsg), ff_amf_write_string(&pp, description);
"%s is now published", filename); if (details) {
ff_amf_write_string(&pp, statusmsg); ff_amf_write_field_name(&pp, "details");
ff_amf_write_field_name(&pp, "details"); ff_amf_write_string(&pp, details);
ff_amf_write_string(&pp, filename); }
ff_amf_write_object_end(&pp); ff_amf_write_object_end(&pp);
spkt.size = pp - spkt.data; spkt.size = pp - spkt.data;
@ -1964,20 +1963,22 @@ static int send_invoke_response(URLContext *s, RTMPPacket *pkt)
pp = spkt.data; pp = spkt.data;
ff_amf_write_string(&pp, "onFCPublish"); ff_amf_write_string(&pp, "onFCPublish");
} else if (!strcmp(command, "publish")) { } else if (!strcmp(command, "publish")) {
char statusmsg[128];
snprintf(statusmsg, sizeof(statusmsg), "%s is now published", filename);
ret = write_begin(s); ret = write_begin(s);
if (ret < 0) if (ret < 0)
return ret; return ret;
// Send onStatus(NetStream.Publish.Start) // Send onStatus(NetStream.Publish.Start)
return write_status(s, pkt, "NetStream.Publish.Start", return write_status(s, pkt, "NetStream.Publish.Start",
filename); statusmsg, filename);
} else if (!strcmp(command, "play")) { } else if (!strcmp(command, "play")) {
ret = write_begin(s); ret = write_begin(s);
if (ret < 0) if (ret < 0)
return ret; return ret;
rt->state = STATE_SENDING; rt->state = STATE_SENDING;
return write_status(s, pkt, "NetStream.Play.Start", return write_status(s, pkt, "NetStream.Play.Start",
filename); "playing stream", NULL);
} else { } else {
if ((ret = ff_rtmp_packet_create(&spkt, RTMP_SYSTEM_CHANNEL, if ((ret = ff_rtmp_packet_create(&spkt, RTMP_SYSTEM_CHANNEL,
RTMP_PT_INVOKE, 0, RTMP_PT_INVOKE, 0,