[FFmpeg-cvslog] avformat/matroskadec: Check desc_bytes
Michael Niedermayer
git at videolan.org
Mon Apr 18 19:06:19 EEST 2022
ffmpeg | branch: release/3.2 | Michael Niedermayer <michael at niedermayer.cc> | Sat Feb 5 20:37:22 2022 +0100| [c787a2733596c942d266fe822f3486aad9b3b3f6] | committer: Michael Niedermayer
avformat/matroskadec: Check desc_bytes
Fixes: Division by 0
Fixes: 44035/clusterfuzz-testcase-minimized-ffmpeg_dem_WEBM_DASH_MANIFEST_fuzzer-4826721386364928
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 5038933977d06d1048b41d71e0ada4d1ac536ddc)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c787a2733596c942d266fe822f3486aad9b3b3f6
---
libavformat/matroskadec.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 48e9c1263f..ce886bda3a 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -3686,12 +3686,16 @@ static int64_t webm_dash_manifest_compute_bandwidth(AVFormatContext *s, int64_t
do {
int64_t desc_bytes = desc_end.end_offset - desc_beg.start_offset;
int64_t desc_ns = desc_end.end_time_ns - desc_beg.start_time_ns;
- double desc_sec = desc_ns / nano_seconds_per_second;
- double calc_bits_per_second = (desc_bytes * 8) / desc_sec;
+ double desc_sec, calc_bits_per_second, percent, mod_bits_per_second;
+ if (desc_bytes <= 0)
+ return -1;
+
+ desc_sec = desc_ns / nano_seconds_per_second;
+ calc_bits_per_second = (desc_bytes * 8) / desc_sec;
// Drop the bps by the percentage of bytes buffered.
- double percent = (desc_bytes - prebuffer_bytes) / desc_bytes;
- double mod_bits_per_second = calc_bits_per_second * percent;
+ percent = (desc_bytes - prebuffer_bytes) / desc_bytes;
+ mod_bits_per_second = calc_bits_per_second * percent;
if (prebuffer < desc_sec) {
double search_sec =
More information about the ffmpeg-cvslog
mailing list