ffmpeg | branch: master | Andreas Cadhalpun <andreas.cadhal...@googlemail.com> | Thu Dec 15 02:14:40 2016 +0100| [5b0ae88ca6b3eb85dbda1762f16f1b5e7c3aa014] | committer: Andreas Cadhalpun
genh: prevent overflow during block alignment calculation Reviewed-by: Michael Niedermayer <mich...@niedermayer.cc> Reviewed-by: Paul B Mahol <one...@gmail.com> Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b0ae88ca6b3eb85dbda1762f16f1b5e7c3aa014 --- libavformat/genh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/genh.c b/libavformat/genh.c index b683e02..dd4e76d 100644 --- a/libavformat/genh.c +++ b/libavformat/genh.c @@ -20,6 +20,7 @@ */ #include "libavutil/intreadwrite.h" +#include "libavcodec/internal.h" #include "avformat.h" #include "internal.h" @@ -54,7 +55,7 @@ static int genh_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->channels = avio_rl32(s->pb); - if (st->codecpar->channels <= 0) + if (st->codecpar->channels <= 0 || st->codecpar->channels > FF_SANE_NB_CHANNELS) return AVERROR_INVALIDDATA; if (st->codecpar->channels == 1) st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
