[FFmpeg-cvslog] avformat/wavdec: Check for data_size overflow

Michael Niedermayer git at videolan.org
Wed Jul 29 14:06:29 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Jul 29 13:34:50 2015 +0200| [f40ec70478648c1e6cde43b8577c3c29380372ee] | committer: Michael Niedermayer

avformat/wavdec: Check for data_size overflow

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/wavdec.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index db42f59..1803b5c 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -429,6 +429,11 @@ break_loop:
 
     avio_seek(pb, data_ofs, SEEK_SET);
 
+    if (data_size > (INT64_MAX>>3)) {
+        av_log(s, AV_LOG_WARNING, "Data size %"PRId64" is too large\n", data_size);
+        data_size = 0;
+    }
+
     if (   data_size > 0 && sample_count && st->codec->channels
         && (data_size << 3) / sample_count / st->codec->channels > st->codec->bits_per_coded_sample) {
         av_log(s, AV_LOG_WARNING, "ignoring wrong sample_count %"PRId64"\n", sample_count);



More information about the ffmpeg-cvslog mailing list