Browse Source

matroskadec: prevent potential integer overflow

Iam not sure this can happen, but its safer we check.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.0
Michael Niedermayer 13 years ago
parent
commit
c30f53e4d8
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavformat/matroskadec.c

+ 1
- 1
libavformat/matroskadec.c View File

@@ -1580,7 +1580,7 @@ static int matroska_read_header(AVFormatContext *s)
&& (track->codec_priv.data != NULL)) { && (track->codec_priv.data != NULL)) {
fourcc = AV_RL32(track->codec_priv.data); fourcc = AV_RL32(track->codec_priv.data);
codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc); 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. /* Only ALAC's magic cookie is stored in Matroska's track headers.
Create the "atom size", "tag", and "tag version" fields the Create the "atom size", "tag", and "tag version" fields the
decoder expects manually. */ decoder expects manually. */


Loading…
Cancel
Save