1. ffmpeg
  2. Commit 093e58228e77f28fd8adf50435b30dcb9b246164
Browse code

avcodec/smacker: Check that the data size is a multiple of a sample vector

Fixes out of array access
Fixes: ce19e41f0ef1e52a23edc488faecdb58/asan_heap-oob_2504e97_4202_ffa0df1baed14022b9bfd4f8ac23d0cb.smk

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

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Michael Niedermayer authored on 2015/11/15 22:52:08
Showing 1 changed files
libavcodec/smacker.c
History View file @ 093e582
... ... 
@@ -670,6 +670,10 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data,
670 670
671 671 
     /* get output buffer */
672 672 
     frame->nb_samples = unp_size / (avctx->channels * (bits + 1));
673 
+    if (unp_size % (avctx->channels * (bits + 1))) {
674 
+        av_log(avctx, AV_LOG_ERROR, "unp_size %d is odd\n", unp_size);
675 
+        return AVERROR(EINVAL);
676 
+    }
673 677 
     if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
674 678 
         return ret;
675 679 
     samples  = (int16_t *)frame->data[0];