[FFmpeg-devel] [PATCH 9/9] xvag: prevent overflow during block alignment calculation

Andreas Cadhalpun andreas.cadhalpun at googlemail.com
Fri Jan 6 21:49:49 EET 2017


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

diff --git a/libavformat/xvag.c b/libavformat/xvag.c
index 5ef4fb0900..1f28df7b89 100644
--- a/libavformat/xvag.c
+++ b/libavformat/xvag.c
@@ -74,6 +74,7 @@ static int xvag_read_header(AVFormatContext *s)
     switch (codec) {
     case 0x1c:
         st->codecpar->codec_id    = AV_CODEC_ID_ADPCM_PSX;
+        FF_RETURN_ON_OVERFLOW(s, st->codecpar->channels > INT_MAX / 16)
         st->codecpar->block_align = 16 * st->codecpar->channels;
         break;
     default:
-- 
2.11.0



More information about the ffmpeg-devel mailing list