Module: libav Branch: release/0.8 Commit: ea1c9424d1c425c657b43fbba478e65af2e2c774
Author: Martin Storsjö <[email protected]> Committer: Luca Barbato <[email protected]> Date: Sat Sep 28 23:13:26 2013 +0300 xwma: Avoid division by zero Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected] Signed-off-by: Martin Storsjö <[email protected]> (cherry picked from commit adc09136a4a63b152630abeacb22c56541eacf60) Signed-off-by: Luca Barbato <[email protected]> (cherry picked from commit 2ff935a06008fb1959ff633962fbc728762c33cb) --- libavformat/xwma.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/xwma.c b/libavformat/xwma.c index 94abfc7..f690e19 100644 --- a/libavformat/xwma.c +++ b/libavformat/xwma.c @@ -200,6 +200,14 @@ static int xwma_read_header(AVFormatContext *s, AVFormatParameters *ap) /* Estimate the duration from the total number of output bytes. */ const uint64_t total_decoded_bytes = dpds_table[dpds_table_size - 1]; + + if (!bytes_per_sample) { + av_log(s, AV_LOG_ERROR, + "Invalid bits_per_coded_sample %d for %d channels\n", + st->codec->bits_per_coded_sample, st->codec->channels); + return AVERROR_INVALIDDATA; + } + st->duration = total_decoded_bytes / bytes_per_sample; /* Use the dpds data to build a seek table. We can only do this after _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
