ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/dvbsubdec: Use ff_set_dimensions()

Browse Source 
Fixes: signed integer overflow: 65313 * 65313 cannot be represented in type 'int'
Fixes: 15740/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DVBSUB_fuzzer-5641749164195840

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>
(cherry picked from commit 5941b7f615)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-07-20 00:07:59 +02:00
parent 996accb0d7
commit 45a306e4c4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/dvbsubdec.c
View File

@ -1581,8 +1581,9 @@ static int dvbsub_parse_display_definition_segment(AVCodecContext *avctx,
display_def->width = bytestream_get_be16(&buf) + 1; display_def->width = bytestream_get_be16(&buf) + 1;
display_def->height = bytestream_get_be16(&buf) + 1; display_def->height = bytestream_get_be16(&buf) + 1;
if (!avctx->width || !avctx->height) { if (!avctx->width || !avctx->height) {
avctx->width = display_def->width; int ret = ff_set_dimensions(avctx, display_def->width, display_def->height);
avctx->height = display_def->height; if (ret < 0)
return ret;
} }
if (info_byte & 1<<3) { // display_window_flag if (info_byte & 1<<3) { // display_window_flag