diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-02-07 21:50:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-09 22:02:20 +0200 |
| commit | 1be3f57841f4b40d7fd607f3cfac198b2807b493 (patch) | |
| tree | 56306382f2459de03886b3407d84718ae64fb908 | |
| parent | 099130c0cd559a247cf3892ea5222e670268748b (diff) | |
| download | ffmpeg-1be3f57841f4b40d7fd607f3cfac198b2807b493.tar.gz | |
avformat/asfdec_f: Add an additional check for the extradata size
Fixes: OOM
Fixes: 30066/clusterfuzz-testcase-minimized-ffmpeg_dem_ASF_fuzzer-6182309126602752
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2c8cd4490a6ab2742e6ad1ce059b4f4957b39500)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/asfdec_f.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index bfa3bc577f..b868de106e 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -514,6 +514,8 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) tag1 = avio_rl32(pb); avio_skip(pb, 20); if (sizeX > 40) { + if (size < sizeX - 40) + return AVERROR_INVALIDDATA; st->codecpar->extradata_size = ffio_limit(pb, sizeX - 40); st->codecpar->extradata = av_mallocz(st->codecpar->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); |