[FFmpeg-cvslog] xwma: Avoid division by zero

Martin Storsjö git at videolan.org
Tue Oct 8 01:33:18 CEST 2013


ffmpeg | branch: release/1.1 | Martin Storsjö <martin at martin.st> | Sat Sep 28 23:13:26 2013 +0300| [2ff935a06008fb1959ff633962fbc728762c33cb] | committer: Luca Barbato

xwma: Avoid division by zero

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org
Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit adc09136a4a63b152630abeacb22c56541eacf60)
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ff935a06008fb1959ff633962fbc728762c33cb
---

 libavformat/xwma.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index 46ca0b8..5500db8 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



More information about the ffmpeg-cvslog mailing list