diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-11-18 00:58:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-02-02 14:18:21 +0100 |
| commit | c15e4b5a2001a5bcd3a3fb3ca66c32c6b4fc98ab (patch) | |
| tree | bb62d2ede5817de70a2b153a540286908efc1446 | |
| parent | aa4d9952c9d3ed2562540269637d39c76032536a (diff) | |
| download | ffmpeg-c15e4b5a2001a5bcd3a3fb3ca66c32c6b4fc98ab.tar.gz | |
avformat/cafdec: Check for EOF in index read loop
Fixes: OOM
Fixes: 27398/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-541296033975500
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit eb46939e3ab3e0e4df69486b1a037bffc50493bd)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/cafdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c index aebd91c6e5..1e9c8c2b0b 100644 --- a/libavformat/cafdec.c +++ b/libavformat/cafdec.c @@ -205,6 +205,8 @@ static int read_pakt_chunk(AVFormatContext *s, int64_t size) st->duration = 0; for (i = 0; i < num_packets; i++) { + if (avio_feof(pb)) + return AVERROR_INVALIDDATA; av_add_index_entry(s->streams[0], pos, st->duration, 0, 0, AVINDEX_KEYFRAME); pos += caf->bytes_per_packet ? caf->bytes_per_packet : ff_mp4_read_descr_len(pb); st->duration += caf->frames_per_packet ? caf->frames_per_packet : ff_mp4_read_descr_len(pb); |