diff options
author | Martin Storsjö <martin@martin.st> | 2013-09-28 23:38:40 +0300 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2014-01-07 09:43:57 +0100 |
commit | 416ad3ecf242946034a552f39718b6aaaa98c272 (patch) | |
tree | 8753cc55775be9cab666ce6eede7837d84f30a0c /libavformat | |
parent | 7fdb915fc712f43879a396015b6fc56e40e89b35 (diff) | |
download | ffmpeg-416ad3ecf242946034a552f39718b6aaaa98c272.tar.gz |
electronicarts: Add more sanity checking for the number of channels
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit a9221e39600a31ee13e736e9e47743cde23f0280)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Conflicts:
libavformat/electronicarts.c
(cherry picked from commit a89868d714705af1b0b004fa790a889e9ba792cd)
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/electronicarts.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c index 0113683ee2..fb8f7185ad 100644 --- a/libavformat/electronicarts.c +++ b/libavformat/electronicarts.c @@ -424,8 +424,9 @@ static int ea_read_header(AVFormatContext *s, } if (ea->audio_codec) { - if (ea->num_channels <= 0) { - av_log(s, AV_LOG_WARNING, "Unsupported number of channels: %d\n", ea->num_channels); + if (ea->num_channels <= 0 || ea->num_channels > 2) { + av_log(s, AV_LOG_WARNING, + "Unsupported number of channels: %d\n", ea->num_channels); ea->audio_codec = 0; return 1; } |