[FFmpeg-cvslog] avformat/wavdec: Check avio_get_str16le() for failure

Michael Niedermayer git at videolan.org
Sun Jan 31 15:45:29 EET 2021


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Jan 29 23:58:04 2021 +0100| [d7594ee751e621f6c7ef4d4977c4a3ce169ae0af] | committer: Michael Niedermayer

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 at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7594ee751e621f6c7ef4d4977c4a3ce169ae0af
---

 libavformat/wavdec.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 3da4150f05..2fba9a08c8 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -922,6 +922,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);



More information about the ffmpeg-cvslog mailing list