aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-10-21 19:37:45 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-11 21:23:48 +0200
commit48fbee3b44481d18b208fe893e4c2da9999567ca (patch)
tree217c7fcc13ae1726b3b976827566eaaa6cad225a
parentb42f802a3855be7124c6d644e6479214bfca9c8b (diff)
downloadffmpeg-48fbee3b44481d18b208fe893e4c2da9999567ca.tar.gz
avformat/xwma: Check for EOF in dpds_table read code
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> (cherry picked from commit 44b18a76b8d4e01c7ce62474aaf196857e75e976) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/xwma.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index 1c18772928..0f0e3fc8ea 100644
--- a/libavformat/xwma.c
+++ b/libavformat/xwma.c
@@ -187,6 +187,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;
}