[FFmpeg-devel] libavformat/rtpenc_mpegts: check avformat_new_stream() return value

[Michael Niedermayer]

On Mon, Nov 27, 2017 at 09:30:53AM +0800, Pan Bian wrote:
> The function avformat_new_stream() returns a NULL pointer on failure.
> However, in function rtp_mpegts_write_header(), its return value is not
> validated before it is dereferenced. Check the return value against NULL
> to avoid potential NULL dereference.
> 
> Signed-off-by: Pan Bian <bianpan2016 at 163.com>
> ---
>  libavformat/rtpenc_mpegts.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/libavformat/rtpenc_mpegts.c b/libavformat/rtpenc_mpegts.c
> index 7af02e0..9089d61 100644
> --- a/libavformat/rtpenc_mpegts.c
> +++ b/libavformat/rtpenc_mpegts.c
> @@ -85,6 +85,10 @@ static int rtp_mpegts_write_header(AVFormatContext *s)
>      }
>      rtp_ctx->oformat = rtp_format;
>      st = avformat_new_stream(rtp_ctx, NULL);
> +	if (!st) {
> +        ret = AVERROR(ENOMEM);
> +        goto fail;
> +	}
>      st->time_base.num   = 1;
>      st->time_base.den   = 90000;
>      st->codecpar->codec_id = AV_CODEC_ID_MPEG2TS;

will apply with the tabs removed

thx

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

Those who are too smart to engage in politics are punished by being
governed by those who are dumber. -- Plato 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20171128/e630b0a3/attachment.sig>