diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-12-07 09:14:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2022-04-09 22:19:40 +0200 |
| commit | 0e6f3166ce39e02e7c533854353a394f3824d362 (patch) | |
| tree | 380b8f94891c0bb626eaf3bb5e26b2dfda481153 | |
| parent | ea318a1fcdd17b015ce0d153549b479219350651 (diff) | |
| download | ffmpeg-0e6f3166ce39e02e7c533854353a394f3824d362.tar.gz | |
avformat/4xm: Check for duplicate track ids
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit dd949124793c722ed55dead9da245574ace81968)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/4xm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/4xm.c b/libavformat/4xm.c index bce2727d79..fd224f9ad5 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -149,6 +149,9 @@ static int parse_strk(AVFormatContext *s, memset(&fourxm->tracks[fourxm->track_count], 0, sizeof(AudioTrack) * (track + 1 - fourxm->track_count)); fourxm->track_count = track + 1; + } else { + if (fourxm->tracks[track].bits) + return AVERROR_INVALIDDATA; } fourxm->tracks[track].adpcm = AV_RL32(buf + 12); fourxm->tracks[track].channels = AV_RL32(buf + 36); |