diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-12-15 04:14:40 +0300 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2017-01-30 03:40:48 +0300 |
| commit | 5b0ae88ca6b3eb85dbda1762f16f1b5e7c3aa014 (patch) | |
| tree | 1388cc7c063b962428ad9f21ece700a52c3f4653 | |
| parent | c4a3526b57dc09e61a2ac58fdcd92a10f344b2c2 (diff) | |
genh: prevent overflow during block alignment calculation
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| -rw-r--r-- | libavformat/genh.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/genh.c b/libavformat/genh.c index b683e026d1..dd4e76d3d9 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; |