[FFmpeg-devel] [PATCH] avformat/rtsp: Fix dereference after null check

[Michael Niedermayer]

On Sun, Apr 12, 2015 at 09:57:19PM +0200, Thomas Volkert wrote:
> 
> Am 12.04.2015 um 21:35 schrieb Himangi Saraogi:
> >---
> >This fixes CID 732219.
> >
> >  libavformat/rtsp.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> >diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
> >index 42dbe96..c186b99 100644
> >--- a/libavformat/rtsp.c
> >+++ b/libavformat/rtsp.c
> >@@ -802,7 +802,7 @@ int ff_rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st)
> >      if (!st)
> >          s->ctx_flags |= AVFMTCTX_NOHEADER;
> >-    if (CONFIG_RTSP_MUXER && s->oformat) {
> >+    if (CONFIG_RTSP_MUXER && s->oformat && st) {
> >          int ret = ff_rtp_chain_mux_open((AVFormatContext **)&rtsp_st->transport_priv,
> >                                          s, st, rtsp_st->rtp_handle,
> >                                          RTSP_TCP_MAX_PACKET_SIZE,
> >@@ -814,7 +814,7 @@ int ff_rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st)
> >          st->time_base = ((AVFormatContext*)rtsp_st->transport_priv)->streams[0]->time_base;
> >      } else if (rt->transport == RTSP_TRANSPORT_RAW) {
> >          return 0; // Don't need to open any parser here
> >-    } else if (CONFIG_RTPDEC && rt->transport == RTSP_TRANSPORT_RDT)
> >+    } else if (CONFIG_RTPDEC && rt->transport == RTSP_TRANSPORT_RDT && st)
> >          rtsp_st->transport_priv = ff_rdt_parse_open(s, st->index,
> >                                              rtsp_st->dynamic_protocol_context,
> >                                              rtsp_st->dynamic_handler);
> LGTM, this addresses the problem which was resported by coverity scan.

applied

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

You can kill me, but you cannot change the truth.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150412/395a7359/attachment.asc>