aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-10-15 22:19:32 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-11 21:23:48 +0200
commit0303836e313c775ed64a0ed17b639634f408e98f (patch)
treebdee849d9b67d967b2d16c6d201c7bdce754229e
parentdcb461aef5aba54dc7f0670fc2659163826d7495 (diff)
downloadffmpeg-0303836e313c775ed64a0ed17b639634f408e98f.tar.gz
avformat/au: Check for EOF in au_read_annotation()
Fixes: Timeout (too looong -> 1 ms) Fixes: 26366/clusterfuzz-testcase-minimized-ffmpeg_dem_SDX_fuzzer-5655584843759616 Fixes: 26391/clusterfuzz-testcase-minimized-ffmpeg_dem_ALP_fuzzer-5484026133217280 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 e680d50eb4feddafb2d8575b21fc5fc8764f4801) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/au.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/au.c b/libavformat/au.c
index 520824fc12..a414292894 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -86,6 +86,8 @@ static int au_read_annotation(AVFormatContext *s, int size)
av_bprint_init(&bprint, 64, AV_BPRINT_SIZE_UNLIMITED);
while (size-- > 0) {
+ if (avio_feof(pb))
+ return AVERROR_EOF;
c = avio_r8(pb);
switch(state) {
case PARSE_KEY: