RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/mspdec: Check packet_size more completely 

Fixes: OOM
Fixes: 28348/clusterfuzz-testcase-minimized-ffmpeg_dem_MSP_fuzzer-4612055872831488
Fixes: 28360/clusterfuzz-testcase-minimized-ffmpeg_dem_MSP_fuzzer-6245230626078720

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2021-03-03 11:00:23 +01:00
parent 460d3dc41f
commit 787501db16
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mspdec.c
View File

@ -70,11 +70,12 @@ static int msp_read_header(AVFormatContext *s)
if (st->codecpar->codec_id == AV_CODEC_ID_RAWVIDEO) {
cntx->packet_size = av_image_get_buffer_size(st->codecpar->format, st->codecpar->width, st->codecpar->height, 1);
if (cntx->packet_size < 0)
return cntx->packet_size;
} else
cntx->packet_size = 2 * st->codecpar->height;
if (cntx->packet_size <= 0)
return cntx->packet_size < 0 ? cntx->packet_size : AVERROR_INVALIDDATA;
return 0;
}