diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-04 12:20:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-04 12:20:53 +0200 |
| commit | 9411e9cafb524baeef054b6afd4d3927d2556869 (patch) | |
| tree | c420a78e7ce3a844d1ccb620877bb02799b8a79b /libavformat/4xm.c | |
| parent | 233ab0f02a316e3f7d515089d5d5dbc4a895ac11 (diff) | |
| parent | d719981273bc779c7d1e879d88404fd867f93a0e (diff) | |
| download | ffmpeg-9411e9cafb524baeef054b6afd4d3927d2556869.tar.gz | |
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>
Diffstat (limited to 'libavformat/4xm.c')
| -rw-r--r-- | libavformat/4xm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 87ecf9f4cf..6e63c67399 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -135,6 +135,7 @@ static int parse_strk(AVFormatContext *s, av_log(s, AV_LOG_ERROR, "current_track too large\n"); return AVERROR_INVALIDDATA; } + if (track + 1 > fourxm->track_count) { if (av_reallocp_array(&fourxm->tracks, track + 1, sizeof(AudioTrack))) return AVERROR(ENOMEM); |