[FFmpeg-cvslog] xmv: check channel number

Michael Niedermayer git at videolan.org
Fri Mar 23 10:44:09 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 23 10:31:45 2012 +0100| [5934d57ba99b3dab4dfe98472ac6b30b9cf6329a] | committer: Michael Niedermayer

xmv: check channel number

Fixes FPE

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=5934d57ba99b3dab4dfe98472ac6b30b9cf6329a
---

 libavformat/xmv.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/libavformat/xmv.c b/libavformat/xmv.c
index 110103e..596da5f 100644
--- a/libavformat/xmv.c
+++ b/libavformat/xmv.c
@@ -183,6 +183,11 @@ static int xmv_read_header(AVFormatContext *s)
         packet->bits_per_sample = avio_rl16(pb);
         packet->flags           = avio_rl16(pb);
 
+        if (!packet->channels) {
+            av_log(s, AV_LOG_ERROR, "0 channels\n");
+            return AVERROR(EINVAL);
+        }
+
         packet->bit_rate      = packet->bits_per_sample *
                                 packet->sample_rate *
                                 packet->channels;



More information about the ffmpeg-cvslog mailing list