Module: libav Branch: release/9 Commit: 5379c5184b9fe9ef06234638f5629d4c80056e04
Author: Martin Storsjö <[email protected]> Committer: Luca Barbato <[email protected]> Date: Thu Sep 19 16:02:29 2013 +0300 segafilm: Validate the number of audio channels This avoids divisions by zero later. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected] Signed-off-by: Martin Storsjö <[email protected]> (cherry picked from commit 82e266c6d3fbf3cc74e515b883e66543381a0f2c) Signed-off-by: Luca Barbato <[email protected]> --- libavformat/segafilm.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index adf2475..5643f33 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -111,6 +111,11 @@ static int film_read_header(AVFormatContext *s) return AVERROR(EIO); film->audio_samplerate = AV_RB16(&scratch[24]); film->audio_channels = scratch[21]; + if (!film->audio_channels || film->audio_channels > 2) { + av_log(s, AV_LOG_ERROR, + "Invalid number of channels: %d\n", film->audio_channels); + return AVERROR_INVALIDDATA; + } film->audio_bits = scratch[22]; if (scratch[23] == 2) film->audio_type = AV_CODEC_ID_ADPCM_ADX; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
