From 70c0ae915d51b0f846f690e0895f18b95f038d9a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 15 Mar 2013 13:48:04 +0100 Subject: [PATCH] matroskadec: avoid integer overflow Found-by: wm4 Signed-off-by: Michael Niedermayer --- libavformat/matroskadec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index dd61962127..26b218663b 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1638,7 +1638,7 @@ static int matroska_read_header(AVFormatContext *s) && (track->codec_priv.data != NULL)) { fourcc = AV_RL32(track->codec_priv.data); codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc); - } else if (codec_id == AV_CODEC_ID_ALAC && track->codec_priv.size && track->codec_priv.size < INT_MAX-12) { + } else if (codec_id == AV_CODEC_ID_ALAC && track->codec_priv.size && track->codec_priv.size < INT_MAX - 12 - FF_INPUT_BUFFER_PADDING_SIZE) { /* Only ALAC's magic cookie is stored in Matroska's track headers. Create the "atom size", "tag", and "tag version" fields the decoder expects manually. */