diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-10-17 23:50:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-10 16:04:26 +0200 |
| commit | 59305f5dfee560aadacc4b31824e8e2400d5a52b (patch) | |
| tree | 02a8ece83ef95aa973f4f1efdcda38a45f85ca10 | |
| parent | ab8e3d3d46e441ebcab1706169b47856d39cd365 (diff) | |
| download | ffmpeg-59305f5dfee560aadacc4b31824e8e2400d5a52b.tar.gz | |
avformat/wavdec: Refuse to read chunks bigger than the filesize in w64_read_header()
Fixes: OOM
Fixes: 26414/clusterfuzz-testcase-minimized-ffmpeg_dem_FWSE_fuzzer-5070632544632832
Fixes: 26475/clusterfuzz-testcase-minimized-ffmpeg_dem_W64_fuzzer-5770207722995712
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 7b2244565ac8cb1eddd085e1a382a893ac03bfb4)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/wavdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 684efd97f9..fe0456ea1d 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -849,6 +849,7 @@ static int w64_read_header(AVFormatContext *s) } else if (!memcmp(guid, ff_w64_guid_summarylist, 16)) { int64_t start, end, cur; uint32_t count, chunk_size, i; + int64_t filesize = avio_size(s->pb); start = avio_tell(pb); end = start + FFALIGN(size, INT64_C(8)) - 24; @@ -863,7 +864,7 @@ static int w64_read_header(AVFormatContext *s) chunk_key[4] = 0; avio_read(pb, chunk_key, 4); chunk_size = avio_rl32(pb); - if (chunk_size == UINT32_MAX) + if (chunk_size == UINT32_MAX || (filesize >= 0 && chunk_size > filesize)) return AVERROR_INVALIDDATA; value = av_mallocz(chunk_size + 1); |