aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-09-28 23:13:26 +0300
committerLuca Barbato <lu_zero@gentoo.org>2013-10-04 03:52:08 +0200
commit2ff935a06008fb1959ff633962fbc728762c33cb (patch)
tree807bb67212ca6e4d3e2584826c4a8805d5037855
parent2e4c649b3e62fdd158b5a9a0f973d3b186a23e94 (diff)
downloadffmpeg-2ff935a06008fb1959ff633962fbc728762c33cb.tar.gz
xwma: Avoid division by zero
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 adc09136a4a63b152630abeacb22c56541eacf60) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r--libavformat/xwma.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index 46ca0b80f1..5500db81d7 100644
--- a/libavformat/xwma.c
+++ b/libavformat/xwma.c
@@ -200,6 +200,14 @@ static int xwma_read_header(AVFormatContext *s)
/* 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