ffmpeg | branch: master | Andreas Cadhalpun <andreas.cadhal...@googlemail.com> | Fri Jan 6 20:31:26 2017 +0100| [cba4f0e97ecbbde7c71ec7a7ae3eb1469b34545b] | committer: Andreas Cadhalpun
xvag: 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=cba4f0e97ecbbde7c71ec7a7ae3eb1469b34545b --- libavformat/xvag.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/xvag.c b/libavformat/xvag.c index 5ef4fb0..22e4f1e 100644 --- a/libavformat/xvag.c +++ b/libavformat/xvag.c @@ -20,6 +20,7 @@ */ #include "libavutil/bswap.h" +#include "libavcodec/internal.h" #include "avformat.h" #include "internal.h" @@ -68,7 +69,7 @@ static int xvag_read_header(AVFormatContext *s) if (st->codecpar->sample_rate <= 0) return AVERROR_INVALIDDATA; - if (st->codecpar->channels <= 0) + if (st->codecpar->channels <= 0 || st->codecpar->channels > FF_SANE_NB_CHANNELS) return AVERROR_INVALIDDATA; switch (codec) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
