From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 72BA641D51 for ; Wed, 20 Apr 2022 18:00:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C9C3C68B3EE; Wed, 20 Apr 2022 21:00:32 +0300 (EEST) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 47B6268B34E for ; Wed, 20 Apr 2022 21:00:26 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id ED07FE6E37 for ; Wed, 20 Apr 2022 20:00:26 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CYdNeYUkeLn7 for ; Wed, 20 Apr 2022 20:00:25 +0200 (CEST) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id D5E45E6E26 for ; Wed, 20 Apr 2022 20:00:24 +0200 (CEST) Date: Wed, 20 Apr 2022 20:00:24 +0200 (CEST) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: <20220414210837.28916-1-cus@passwd.hu> Message-ID: <79555330-aebc-936a-a558-41909211f064@passwd.hu> References: <20220414210837.28916-1-cus@passwd.hu> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] avformat/rtmpproto: send proper status for response to play command X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Thu, 14 Apr 2022, Marton Balint wrote: > This fixes referencing the uninitialized filename variable. > > Fixes ticket #9711. Will apply tomorrow. Regards, Marton > > Signed-off-by: Marton Balint > --- > libavformat/rtmpproto.c | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c > index f97e3c3b8e..f0ef223f05 100644 > --- a/libavformat/rtmpproto.c > +++ b/libavformat/rtmpproto.c > @@ -1857,11 +1857,10 @@ static int write_begin(URLContext *s) > } > > 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; > RTMPPacket spkt = { 0 }; > - char statusmsg[128]; > uint8_t *pp; > int ret; > > @@ -1884,11 +1883,11 @@ static int write_status(URLContext *s, RTMPPacket *pkt, > ff_amf_write_field_name(&pp, "code"); > ff_amf_write_string(&pp, status); > ff_amf_write_field_name(&pp, "description"); > - snprintf(statusmsg, sizeof(statusmsg), > - "%s is now published", filename); > - ff_amf_write_string(&pp, statusmsg); > - ff_amf_write_field_name(&pp, "details"); > - ff_amf_write_string(&pp, filename); > + ff_amf_write_string(&pp, description); > + if (details) { > + ff_amf_write_field_name(&pp, "details"); > + ff_amf_write_string(&pp, details); > + } > ff_amf_write_object_end(&pp); > > spkt.size = pp - spkt.data; > @@ -1964,20 +1963,22 @@ static int send_invoke_response(URLContext *s, RTMPPacket *pkt) > pp = spkt.data; > ff_amf_write_string(&pp, "onFCPublish"); > } else if (!strcmp(command, "publish")) { > + char statusmsg[128]; > + snprintf(statusmsg, sizeof(statusmsg), "%s is now published", filename); > ret = write_begin(s); > if (ret < 0) > return ret; > > // Send onStatus(NetStream.Publish.Start) > return write_status(s, pkt, "NetStream.Publish.Start", > - filename); > + statusmsg, filename); > } else if (!strcmp(command, "play")) { > ret = write_begin(s); > if (ret < 0) > return ret; > rt->state = STATE_SENDING; > return write_status(s, pkt, "NetStream.Play.Start", > - filename); > + "playing stream", NULL); > } else { > if ((ret = ff_rtmp_packet_create(&spkt, RTMP_SYSTEM_CHANNEL, > RTMP_PT_INVOKE, 0, > -- > 2.31.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".