diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2022-03-23 02:57:34 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-09-01 01:41:28 +0300 |
| commit | 9db37b02ed3894d6d10b43f00906dfc94d793c73 (patch) | |
| tree | 71de78ac497287ff3d18583e691e122eaf2ce204 /libavformat | |
| parent | 39f15f66638bee5e81c84a817ea599506835df3a (diff) | |
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>
(cherry picked from commit c16a0ed2422a86e0f3286f59281d119c4d8d159a)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -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 b08ee036ed..9b1c7933ae 100644 --- a/libavformat/aaxdec.c +++ b/libavformat/aaxdec.c @@ -251,6 +251,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; } |