highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/aadec: Check for EOF while reading chapters

Browse Source 
Fixes: timeout
Fixes: 28199/clusterfuzz-testcase-minimized-ffmpeg_dem_AA_fuzzer-4896162657861632

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-12-12 22:19:22 +01:00
parent ee50f72715
commit bcc7d14453
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/aadec.c
View File

@ -223,7 +223,8 @@ static int aa_read_header(AVFormatContext *s)
while ((chapter_pos = avio_tell(pb)) >= 0 && chapter_pos < c->content_end) { while ((chapter_pos = avio_tell(pb)) >= 0 && chapter_pos < c->content_end) {
int chapter_idx = s->nb_chapters; int chapter_idx = s->nb_chapters;
uint32_t chapter_size = avio_rb32(pb); uint32_t chapter_size = avio_rb32(pb);
if (chapter_size == 0) break; if (chapter_size == 0 || avio_feof(pb))
break;
chapter_pos -= start + CHAPTER_HEADER_SIZE * chapter_idx; chapter_pos -= start + CHAPTER_HEADER_SIZE * chapter_idx;
avio_skip(pb, 4 + chapter_size); avio_skip(pb, 4 + chapter_size);
if (!avpriv_new_chapter(s, chapter_idx, st->time_base, if (!avpriv_new_chapter(s, chapter_idx, st->time_base,