ffmpeg | branch: release/2.6 | banastasov <btanasta...@yahoo.co.uk> | Sat May 30 04:28:39 2015 +0200| [df408d213ad1cd0723aa67191071aa371ba5443b] | committer: Carl Eugen Hoyos
avcodec/dvbsubdec: Fix buf_size check in dvbsub_parse_display_definition_segment() Fixes Ticket4326 Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit debf4d6e67dfb29f3d71683add429c588828f8e8) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df408d213ad1cd0723aa67191071aa371ba5443b --- libavcodec/dvbsubdec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index 3846049..a1b8cea 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); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
