From: banastasov Date: Sat, 30 May 2015 02:28:39 +0000 (+0200) Subject: avcodec/dvbsubdec: Fix buf_size check in dvbsub_parse_display_definition_segment() X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=debf4d6e67dfb29f3d71683add429c588828f8e8;p=ffmpeg avcodec/dvbsubdec: Fix buf_size check in dvbsub_parse_display_definition_segment() Fixes Ticket4326 Signed-off-by: Michael Niedermayer --- diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index 7c3dedf7736..e268e2a38e0 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -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);