diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-01-29 23:58:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-09 22:02:20 +0200 |
| commit | e59cb0f33a83b7a65f92d508c41108d6ca4432c5 (patch) | |
| tree | 855e594d24cc195c87195bac87101702e8221cf9 | |
| parent | 2ed03339c3660168dbf06c0ad9b6584b48828995 (diff) | |
| download | ffmpeg-e59cb0f33a83b7a65f92d508c41108d6ca4432c5.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 bf81908089..e5a2f00814 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -840,6 +840,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); |