diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2021-01-29 23:58:04 +0100 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-02-02 14:18:22 +0100 |
commit | 75285f388f694b7f427b7778a0caf6c1d40ac1f5 (patch) | |
tree | 659cc90baa682259ac5180fe4b4f9f440cf10444 | |
parent | 868f4ff9558ee7b931ddd6318f95a279b5ccc9ec (diff) | |
download | ffmpeg-75285f388f694b7f427b7778a0caf6c1d40ac1f5.tar.gz |
avformat/wavdec: Check avio_get_str16le() for failure
Fixes: out of array access
Fixes: 29195/clusterfuzz-testcase-minimized-ffmpeg_dem_W64_fuzzer-5037853281222656
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 d7594ee751e621f6c7ef4d4977c4a3ce169ae0af)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavformat/wavdec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index ad1c863d2c..dec41d545b 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -873,6 +873,10 @@ static int w64_read_header(AVFormatContext *s) return AVERROR(ENOMEM); ret = avio_get_str16le(pb, chunk_size, value, chunk_size); + if (ret < 0) { + av_free(value); + return ret; + } avio_skip(pb, chunk_size - ret); av_dict_set(&s->metadata, chunk_key, value, AV_DICT_DONT_STRDUP_VAL); |