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

avcodec/dvbsubdec: Check pixel buffer size constraint from ETSI EN 300 743 V1.3.1 

Fixes: OOM
Fixes: 2143/clusterfuzz-testcase-minimized-5482288060039168

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2017-06-09 23:16:55 +02:00
parent 4bcde26172
commit e1b0044c23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/dvbsubdec.c
View File

@ -1158,6 +1158,10 @@ static int dvbsub_parse_region_segment(AVCodecContext *avctx,
buf += 2;
ret = av_image_check_size2(region->width, region->height, avctx->max_pixels, AV_PIX_FMT_PAL8, 0, avctx);
if (ret >= 0 && region->width * region->height * 2 > 320 * 1024 * 8) {
ret = AVERROR_INVALIDDATA;
av_log(avctx, AV_LOG_ERROR, "Pixel buffer memory constraint violated\n");
}
if (ret < 0) {
region->width= region->height= 0;
return ret;