diff mbox series

[FFmpeg-devel,4/9] avformat/xwma: Check for EOF in dpds_table read code

Message ID 20201021223733.2563-4-michael@niedermayer.cc
State Accepted
Commit 44b18a76b8d4e01c7ce62474aaf196857e75e976
Headers show
Series [FFmpeg-devel,1/9] avformat/segafilm: Check that there is a stream
Related show

Checks

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

Commit Message

Michael Niedermayer Oct. 21, 2020, 10:37 p.m. UTC
Fixes: Timeout (>30 -> 140ms)
Fixes: 26478/clusterfuzz-testcase-minimized-ffmpeg_dem_XWMA_fuzzer-5918147066200064

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

Patch

diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index 5a57caa841..aedadcf140 100644
--- a/libavformat/xwma.c
+++ b/libavformat/xwma.c
@@ -211,6 +211,10 @@  static int xwma_read_header(AVFormatContext *s)
             }
 
             for (i = 0; i < dpds_table_size; ++i) {
+                if (avio_feof(pb)) {
+                    ret = AVERROR_INVALIDDATA;
+                    goto fail;
+                }
                 dpds_table[i] = avio_rl32(pb);
                 size -= 4;
             }