avcodec/utils: Better check for channels in av_get_audio_frame_duration()
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 14 Nov 2015 00:35:08 +0000 (01:35 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 14 Nov 2015 02:02:28 +0000 (03:02 +0100)
Fixes integer overflow
Fixes: 0c2625f236ced104d402b4a03c0d65c7/asan_generic_274e1ce_5990_9314e7a67c26aecf011b178ade9f217c.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 4e16ad2868a1819de6680fc355a8eb20164adaea)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/utils.c

index 6596aea..cc689d8 100644 (file)
@@ -3418,7 +3418,7 @@ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes)
                 return frame_bytes * 8 / bps;
         }
 
-        if (ch > 0) {
+        if (ch > 0 && ch < INT_MAX/16) {
             /* calc from frame_bytes and channels */
             switch (id) {
             case AV_CODEC_ID_ADPCM_AFC: