aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-10-21 19:37:45 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-02-02 14:18:21 +0100
commita0db3ad5d5200d3aed179edce373e322e58d0eac (patch)
treeeb282fb5036c19026ee49199a949a5ee7771267a
parent4b080eaf2b437a86c3cffa37fa1a258205f9e50b (diff)
downloadffmpeg-a0db3ad5d5200d3aed179edce373e322e58d0eac.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 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;
}