From df408d213ad1cd0723aa67191071aa371ba5443b Mon Sep 17 00:00:00 2001 From: banastasov Date: Sat, 30 May 2015 04:28:39 +0200 Subject: [PATCH] avcodec/dvbsubdec: Fix buf_size check in dvbsub_parse_display_definition_segment() Fixes Ticket4326 Signed-off-by: Michael Niedermayer (cherry picked from commit debf4d6e67dfb29f3d71683add429c588828f8e8) --- libavcodec/dvbsubdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index 384604949f..a1b8cea938 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -1503,10 +1503,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);