From e045be92cdf5a2851900e8e85b815c29ae6f100a Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Tue, 24 Sep 2019 18:31:43 +0200 Subject: [PATCH] avformat/utils: Assert that stream_index is valid There is currently an ordinary check for this (which would lead to a memleak), but given that no demuxer should ever return a packet with an invalid stream_index it is more appropriate for this to be an assert. FATE passes with this change. Signed-off-by: Andreas Rheinhardt Signed-off-by: James Almer --- libavformat/utils.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 3168931587..4d628119b6 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -884,10 +884,8 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) continue; } - if (pkt->stream_index >= (unsigned)s->nb_streams) { - av_log(s, AV_LOG_ERROR, "Invalid stream index %d\n", pkt->stream_index); - continue; - } + av_assert0(pkt->stream_index < (unsigned)s->nb_streams && + "Invalid stream index.\n"); st = s->streams[pkt->stream_index];