diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-12-07 09:14:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-01-13 22:50:16 +0100 |
| commit | 0bcd3550a4ddc441aae04fedfe2d80918be705ed (patch) | |
| tree | 7cf004f63119fd2b545efa51d2716bb7fa456afe | |
| parent | 6cdc8b3c133a05f4d30654fcb0af3f3df51409e3 (diff) | |
| download | ffmpeg-0bcd3550a4ddc441aae04fedfe2d80918be705ed.tar.gz | |
avformat/4xm: Consider max_streams on reallocating tracks array
Fixes: OOM
Fixes: 41595/clusterfuzz-testcase-minimized-ffmpeg_dem_FOURXM_fuzzer-6355979363549184
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 0dcd95ef8a2e16ed930296567ab1044e33602a34)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/4xm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 9880060f84..7afdf252c5 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -136,7 +136,8 @@ static int parse_strk(AVFormatContext *s, return AVERROR_INVALIDDATA; track = AV_RL32(buf + 8); - if ((unsigned)track >= UINT_MAX / sizeof(AudioTrack) - 1) { + if ((unsigned)track >= UINT_MAX / sizeof(AudioTrack) - 1 || + track >= s->max_streams) { av_log(s, AV_LOG_ERROR, "current_track too large\n"); return AVERROR_INVALIDDATA; } |