diff mbox

[FFmpeg-devel,4/7] genh: prevent overflow during block alignment calculation

Message ID a4808b34-fea7-e4e1-0324-640a2ea67b5a@googlemail.com
State Superseded
Headers show

Commit Message

Andreas Cadhalpun Dec. 16, 2016, 2:33 a.m. UTC 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
---
 libavformat/genh.c | 1 +
 1 file changed, 1 insertion(+)
diff mbox

Patch

diff --git a/libavformat/genh.c b/libavformat/genh.c
index b683e02..e23c1b2 100644
--- a/libavformat/genh.c
+++ b/libavformat/genh.c
@@ -74,6 +74,7 @@  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;
+             FF_BAIL_ON_OVERFLOW(s, st->codecpar->channels > INT_MAX / 36)
              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;