diff mbox series

[FFmpeg-devel,3/3] avformat/wavdec: Check smv_block_size

Message ID 20211004222350.29657-3-michael@niedermayer.cc
State Accepted
Commit 849138f476f4b08656681bfc3aec5beac47777fb
Headers show
Series [FFmpeg-devel,1/3] avcodec/wmaprodec: Do not initialize unused variable to out of array value | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Michael Niedermayer Oct. 4, 2021, 10:23 p.m. UTC 
Fixes: Timeout
Fixes: 39554/clusterfuzz-testcase-minimized-ffmpeg_dem_WAV_fuzzer-4915221701984256

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/wavdec.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Michael Niedermayer Oct. 9, 2021, 9:40 a.m. UTC | #1 
On Tue, Oct 05, 2021 at 12:23:50AM +0200, Michael Niedermayer wrote:
> Fixes: Timeout
> Fixes: 39554/clusterfuzz-testcase-minimized-ffmpeg_dem_WAV_fuzzer-4915221701984256
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/wavdec.c | 2 ++
>  1 file changed, 2 insertions(+)

will apply

[...]
diff mbox series

Patch

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 7a7e765353f..01090b69472 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -498,6 +498,8 @@  static int wav_read_header(AVFormatContext *s)
             wav->smv_data_ofs = avio_tell(pb) + (size - 5) * 3;
             avio_rl24(pb);
             wav->smv_block_size = avio_rl24(pb);
+            if (!wav->smv_block_size)
+                return AVERROR_INVALIDDATA;
             avpriv_set_pts_info(vst, 32, 1, avio_rl24(pb));
             vst->duration = avio_rl24(pb);
             avio_rl24(pb);