diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2022-03-23 00:57:34 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-06-17 01:54:05 +0200 |
commit | c16a0ed2422a86e0f3286f59281d119c4d8d159a (patch) | |
tree | 61470290e9c5a4a2d886b529c7c945471930ab30 | |
parent | b0cac7082d8a3ff2d4f039af01b45c48bb578de7 (diff) | |
download | ffmpeg-c16a0ed2422a86e0f3286f59281d119c4d8d159a.tar.gz |
avformat/aaxdec: Check for overlaping segments
Fixes: Timeout
Fixes: 45875/clusterfuzz-testcase-minimized-ffmpeg_dem_AAX_fuzzer-6121689903136768
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavformat/aaxdec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/aaxdec.c b/libavformat/aaxdec.c index e47ab3ad73..dd1fbde736 100644 --- a/libavformat/aaxdec.c +++ b/libavformat/aaxdec.c @@ -252,6 +252,10 @@ static int aax_read_header(AVFormatContext *s) size = avio_rb32(pb); a->segments[r].start = start + a->data_offset; a->segments[r].end = a->segments[r].start + size; + if (r && + a->segments[r].start < a->segments[r-1].end && + a->segments[r].end > a->segments[r-1].start) + return AVERROR_INVALIDDATA; } else return AVERROR_INVALIDDATA; } |