aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-01-20 00:11:34 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-10 16:04:26 +0200
commite8f9a3690d2c8fe79f9ffe60087c705b952c11a0 (patch)
tree8e4e3f712c74c870430e51122e4ffc83bd71919a
parent00c664f10ed8d926a88267fae932350927d58160 (diff)
downloadffmpeg-e8f9a3690d2c8fe79f9ffe60087c705b952c11a0.tar.gz
avformat/paf: Check for EOF before allocation in read_header()
Fixes: OOM Fixes: 26584/clusterfuzz-testcase-minimized-ffmpeg_dem_PAF_fuzzer-5172661183053824 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 bcb1e9d3b9b97359e01e5978067c8ee558efa8b4) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/paf.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/paf.c b/libavformat/paf.c
index 86466907dd..116c4e332f 100644
--- a/libavformat/paf.c
+++ b/libavformat/paf.c
@@ -136,6 +136,10 @@ static int read_header(AVFormatContext *s)
p->start_offset = avio_rl32(pb);
p->max_video_blks = avio_rl32(pb);
p->max_audio_blks = avio_rl32(pb);
+
+ if (avio_feof(pb))
+ return AVERROR_INVALIDDATA;
+
if (p->buffer_size < 175 ||
p->max_audio_blks < 2 ||
p->max_video_blks < 1 ||