avcodec/dvbsubdec: Fix buf_size check in dvbsub_parse_display_definition_segment()

Fixes Ticket4326

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
banastasov 2015-05-30 04:28:39 +02:00 committed by Michael Niedermayer
parent aa9c6b6986
commit debf4d6e67
1 changed files with 3 additions and 3 deletions

View File

@ -1504,10 +1504,10 @@ static int dvbsub_parse_display_definition_segment(AVCodecContext *avctx,
avctx->height = display_def->height;
}
if (buf_size < 13)
return AVERROR_INVALIDDATA;
if (info_byte & 1<<3) { // display_window_flag
if (buf_size < 13)
return AVERROR_INVALIDDATA;
display_def->x = bytestream_get_be16(&buf);
display_def->width = bytestream_get_be16(&buf) - display_def->x + 1;
display_def->y = bytestream_get_be16(&buf);