summaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-15 00:56:33 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-15 00:56:54 +0100
commita3cb7f992f88fcfa524bd9cd08b28e09d6718f75 (patch)
tree1bc96a14e2c1a25bb53927f70ca8623bde67cbec /libavformat
parent12eb2fd5394813a6119912b22f5dfc17b4a6b4a0 (diff)
downloadffmpeg-streaming-a3cb7f992f88fcfa524bd9cd08b28e09d6718f75.zip
ffmpeg-streaming-a3cb7f992f88fcfa524bd9cd08b28e09d6718f75.tar.gz
xwma: check bytes_per_sample, fix division by 0.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/xwma.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index 04c3629..db7d971 100644
--- a/libavformat/xwma.c
+++ b/libavformat/xwma.c
@@ -200,6 +200,12 @@ 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, "bytes_per_sample is 0\n");
+ 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
OpenPOWER on IntegriCloud