diff mbox series

[FFmpeg-devel,3/5] avformat/wavdec: Check for EOF in cues reading

Message ID 20201102002128.6685-3-michael@niedermayer.cc
State Accepted
Commit 72ca9f38e42169d3d0efdad5fd4019b1abe4f152
Headers show
Series [FFmpeg-devel,1/5] avformat/vqf: Check len for COMM chunks
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished

Commit Message

Michael Niedermayer Nov. 2, 2020, 12:21 a.m. UTC
Fixes: Timeout (>20sec -> 1ms)
Fixes: 26793/clusterfuzz-testcase-minimized-ffmpeg_dem_WAV_fuzzer-5674966852567040

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 | 3 +++
 1 file changed, 3 insertions(+)

Comments

Michael Niedermayer Dec. 4, 2020, 4:29 p.m. UTC | #1
On Mon, Nov 02, 2020 at 01:21:26AM +0100, Michael Niedermayer wrote:
> Fixes: Timeout (>20sec -> 1ms)
> Fixes: 26793/clusterfuzz-testcase-minimized-ffmpeg_dem_WAV_fuzzer-5674966852567040
> 
> 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 | 3 +++
>  1 file changed, 3 insertions(+)

will apply

[...]
diff mbox series

Patch

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index a81f2c7a67..5b9869939f 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -558,6 +558,9 @@  static int wav_read_header(AVFormatContext *s)
                     for (int i = 0; i < nb_cues; i++) {
                         unsigned offset, id = avio_rl32(pb);
 
+                        if (avio_feof(pb))
+                            return AVERROR_INVALIDDATA;
+
                         avio_skip(pb, 16);
                         offset = avio_rl32(pb);