diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-05-07 12:38:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-02 19:55:09 +0200 |
| commit | 57ef3712d7a7197938a7ccc238769f8abb63c99f (patch) | |
| tree | d6fbc23e67eeb5c75b0bb5fe4a54f9fd6c0bcf24 | |
| parent | 4077647a8f9fd9c0a6622bf13bc35138c7dfcd4a (diff) | |
| download | ffmpeg-57ef3712d7a7197938a7ccc238769f8abb63c99f.tar.gz | |
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 cd74af14162c803f18e90bb12b52135e893d990c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mpegts.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 6f137fec20..ca6430de18 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2416,15 +2416,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)) |