summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-12-07 09:14:08 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2022-04-09 22:19:40 +0200
commitea318a1fcdd17b015ce0d153549b479219350651 (patch)
tree4e3de2ecbbdaa25085ab84f3a8d7e898567d82e1 /libavformat
parentf80d5425aed4397654a97abf48a6b78fcd92d6d7 (diff)
downloadffmpeg-ea318a1fcdd17b015ce0d153549b479219350651.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>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/4xm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/4xm.c b/libavformat/4xm.c
index 8e2d305b24..bce2727d79 100644
--- a/libavformat/4xm.c
+++ b/libavformat/4xm.c
@@ -137,7 +137,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;
}