[FFmpeg-cvslog] avformat/wavdec: add basic sanity check for the sample count

Michael Niedermayer git at videolan.org
Mon Jul 14 15:07:59 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 14 14:52:18 2014 +0200| [47c84c0bf784991d95f68d989f4faf31eeb03afa] | committer: Michael Niedermayer

avformat/wavdec: add basic sanity check for the sample count

Fixes Ticket3708

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index a865b76..1d77402 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -402,6 +402,11 @@ break_loop:
 
     avio_seek(pb, data_ofs, SEEK_SET);
 
+    if (data_size > 0 && sample_count && data_size / sample_count / st->codec->channels > 8) {
+        av_log(s, AV_LOG_WARNING, "ignoring wrong sample_count %"PRId64"\n", sample_count);
+        sample_count = 0;
+    }
+
     if (!sample_count || av_get_exact_bits_per_sample(st->codec->codec_id) > 0)
         if (   st->codec->channels
             && data_size



More information about the ffmpeg-cvslog mailing list