ffmpeg | branch: release/2.6 | Andreas Cadhalpun <andreas.cadhal...@googlemail.com> | Sat Jul 11 00:09:46 2015 +0200| [de61d9f8a1c39e2e9a550553f289c55f8fe74cfd] | committer: Andreas Cadhalpun
riffdec: prevent negative bit rate Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> (cherry picked from commit 189420cb561929e05f5cc4224cdca83740a24a32) Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=de61d9f8a1c39e2e9a550553f289c55f8fe74cfd --- libavformat/riffdec.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index 4afe807..632c58c 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -103,6 +103,14 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, codec->bit_rate = avio_rb32(pb) * 8; codec->block_align = avio_rb16(pb); } + if (codec->bit_rate < 0) { + av_log(s, AV_LOG_WARNING, + "Invalid bit rate: %d\n", codec->bit_rate); + if (s->error_recognition & AV_EF_EXPLODE) + return AVERROR_INVALIDDATA; + else + codec->bit_rate = 0; + } if (size == 14) { /* We're dealing with plain vanilla WAVEFORMAT */ codec->bits_per_coded_sample = 8; } else { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
