[FFmpeg-cvslog] Fix division by 0 due to audio frame size

Michael Niedermayer git at videolan.org
Sun Feb 10 18:25:37 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 10 18:15:33 2013 +0100| [ea1d8465e6eca582c09e2526f677033b62576fda] | committer: Michael Niedermayer

Fix division by 0 due to audio frame size

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/mvi.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavformat/mvi.c b/libavformat/mvi.c
index 6b74597..953c182 100644
--- a/libavformat/mvi.c
+++ b/libavformat/mvi.c
@@ -96,6 +96,10 @@ static int read_header(AVFormatContext *s)
     mvi->get_int = (vst->codec->width * vst->codec->height < (1 << 16)) ? avio_rl16 : avio_rl24;
 
     mvi->audio_frame_size   = ((uint64_t)mvi->audio_data_size << MVI_FRAC_BITS) / frames_count;
+    if (!mvi->audio_frame_size) {
+        av_log(s, AV_LOG_ERROR, "audio_frame_size is 0\n");
+        return AVERROR_INVALIDDATA;
+    }
     mvi->audio_size_counter = (ast->codec->sample_rate * 830 / mvi->audio_frame_size - 1) * mvi->audio_frame_size;
     mvi->audio_size_left    = mvi->audio_data_size;
 



More information about the ffmpeg-cvslog mailing list