]> git.sesse.net Git - ffmpeg/commitdiff
avformat/mpeg: Don't use unintialized value
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Tue, 22 Oct 2019 12:54:09 +0000 (14:54 +0200)
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Thu, 9 Apr 2020 13:16:20 +0000 (15:16 +0200)
vobsub_read_packet() didn't check whether an array of AVPackets was
valid and therefore used uninitialized values.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
libavformat/mpeg.c

index eba585226632eb4b697dd42816a562bfa185726c..33c039806065df08e671db0f27911704a1f75538 100644 (file)
@@ -927,6 +927,10 @@ static int vobsub_read_packet(AVFormatContext *s, AVPacket *pkt)
         FFDemuxSubtitlesQueue *tmpq = &vobsub->q[i];
         int64_t ts;
         av_assert0(tmpq->nb_subs);
+
+        if (tmpq->current_sub_idx >= tmpq->nb_subs)
+            continue;
+
         ts = tmpq->subs[tmpq->current_sub_idx].pts;
         if (ts < min_ts) {
             min_ts = ts;