summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2021-01-20 00:11:34 +0100
committerMichael Niedermayer <[email protected]>2021-10-09 22:02:20 +0200
commit3374ed3d42a4faf709cc14f494cdfdfa251c1d75 (patch)
treeca6098da781467f93d86a5381519c68317b82889
parentcf8a7b7b4e78df0c020d17281a1af8e11490aaad (diff)
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 <[email protected]> (cherry picked from commit bcb1e9d3b9b97359e01e5978067c8ee558efa8b4) Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavformat/paf.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/paf.c b/libavformat/paf.c
index a2d411c2f6..47b61c226a 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 ||