Browse Source

avformat/mpegts: Shuffle avio_seek

This avoids accessing an old, no longer valid buffer.
Fixes: out of array access
Fixes: crash_audio-2020

Found-by: le wu <shoulewoba@gmail.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit cd74af1416)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n4.1.6
Michael Niedermayer 5 years ago
parent
commit
71fefa15c0
1 changed files with 4 additions and 3 deletions
  1. +4
    -3
      libavformat/mpegts.c

+ 4
- 3
libavformat/mpegts.c View File

@@ -2631,15 +2631,16 @@ static int mpegts_resync(AVFormatContext *s, int seekback, const uint8_t *curren
AVIOContext *pb = s->pb;
int c, i;
uint64_t pos = avio_tell(pb);

avio_seek(pb, -FFMIN(seekback, pos), SEEK_CUR);
int64_t back = FFMIN(seekback, pos);

//Special case for files like 01c56b0dc1.ts
if (current_packet[0] == 0x80 && current_packet[12] == 0x47) {
avio_seek(pb, 12, SEEK_CUR);
avio_seek(pb, 12 - back, SEEK_CUR);
return 0;
}

avio_seek(pb, -back, SEEK_CUR);

for (i = 0; i < ts->resync_size; i++) {
c = avio_r8(pb);
if (avio_feof(pb))


Loading…
Cancel
Save