ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Fri Jun 9 23:16:55 2017 +0200| [e1b0044c234775bf99ab1a5c794240a9a692ad8d] | committer: Michael Niedermayer
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 <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1b0044c234775bf99ab1a5c794240a9a692ad8d --- libavcodec/dvbsubdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index bc16eb735b..98619f9631 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
