[FFmpeg-devel] [PATCH 3/6] genh: prevent overflow during block alignment calculation

[Andreas Cadhalpun]

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
---
 libavformat/genh.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libavformat/genh.c b/libavformat/genh.c
index b683e02..5684352 100644
--- a/libavformat/genh.c
+++ b/libavformat/genh.c
@@ -74,6 +74,11 @@ static int genh_read_header(AVFormatContext *s)
     case  0: st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX;        break;
     case  1:
     case 11: st->codecpar->bits_per_coded_sample = 4;
+             if (st->codecpar->channels > INT_MAX / 36) {
+                av_log(s, AV_LOG_ERROR, "Overflow during block alignment calculation 36 * %d\n",
+                       st->codecpar->channels);
+                return AVERROR_INVALIDDATA;
+             }
              st->codecpar->block_align = 36 * st->codecpar->channels;
              st->codecpar->codec_id = AV_CODEC_ID_ADPCM_IMA_WAV;    break;
     case  2: st->codecpar->codec_id = AV_CODEC_ID_ADPCM_DTK;        break;
-- 
2.10.2