[FFmpeg-devel] [PATCH v4] libavformat/rtsp: return error if rtsp_hd_out is null instead of crash

Aman Gupta ffmpeg at tmm1.net
Fri Sep 27 20:55:25 EEST 2019


On Mon, Sep 23, 2019 at 8:23 AM Ross Nicholson <phunkyfish at gmail.com> wrote:

> Can this be applied?
>

Applied to master. Thank you for your contribution.


>
> > On 19 Sep 2019, at 16:14, Ross Nicholson <phunkyfish at gmail.com> wrote:
> >
> > Updated to v4 of patch after learning from Aman Gupta that 'rt' did not
> need to be checked in the context of this function.
> >
> > Should be good to go now.
> >
> >> On Thu, 19 Sep 2019 at 16:12, phunkyfish <phunkyfish at gmail.com> wrote:
> >> ---
> >>  libavformat/rtsp.c | 3 +++
> >>  1 file changed, 3 insertions(+)
> >>
> >> diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
> >> index c153cac88b..859defa592 100644
> >> --- a/libavformat/rtsp.c
> >> +++ b/libavformat/rtsp.c
> >> @@ -1318,6 +1318,9 @@ static int
> rtsp_send_cmd_with_content_async(AVFormatContext *s,
> >>      char buf[4096], *out_buf;
> >>      char base64buf[AV_BASE64_SIZE(sizeof(buf))];
> >>
> >> +    if (!rt->rtsp_hd_out)
> >> +        return ENOTCONN;
> >> +
> >>      /* Add in RTSP headers */
> >>      out_buf = buf;
> >>      rt->seq++;
> >> --
> >> 2.20.1 (Apple Git-117)
> >>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".


More information about the ffmpeg-devel mailing list