summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-05 17:04:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-05 17:59:12 +0200
commitc30f53e4d8156f1a1e2b15b3d5504c4a67a88d5f (patch)
tree65bf3ff41fe4249c13d16b1390bfbb881ce81b74
parentbc3b4220296e24e2cdd1213208a470853fcb76c3 (diff)
downloadffmpeg-c30f53e4d8156f1a1e2b15b3d5504c4a67a88d5f.tar.gz
matroskadec: prevent potential integer overflow
Iam not sure this can happen, but its safer we check. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/matroskadec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 0f1808773b..500048f761 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1580,7 +1580,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 == CODEC_ID_ALAC && track->codec_priv.size) {
+ } else if (codec_id == CODEC_ID_ALAC && track->codec_priv.size && track->codec_priv.size < INT_MAX-12) {
/* 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. */