1. ffmpeg
  2. Commit 9411e9cafb524baeef054b6afd4d3927d2556869
Browse code

Merge commit 'd719981273bc779c7d1e879d88404fd867f93a0e'

* commit 'd719981273bc779c7d1e879d88404fd867f93a0e':
4xm: Check that the read track value is non-negative

Conflicts:
libavformat/4xm.c

See: 0838cfdc8a10185604db5cd9d6bffad71279a0e8
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2013/09/04 19:20:53
Showing 1 changed files
libavformat/4xm.c
History View file @ 9411e9c
... ... 
@@ -135,6 +135,7 @@ static int parse_strk(AVFormatContext *s,
135 135 
         av_log(s, AV_LOG_ERROR, "current_track too large\n");
136 136 
         return AVERROR_INVALIDDATA;
137 137 
     }
138 
+
138 139 
     if (track + 1 > fourxm->track_count) {
139 140 
         if (av_reallocp_array(&fourxm->tracks, track + 1, sizeof(AudioTrack)))
140 141 
             return AVERROR(ENOMEM);