diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-05-01 18:27:19 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-08-01 07:51:18 -0700 |
| commit | 50493f1f7d2235db811d2991b9e5b330baf7c05a (patch) | |
| tree | 170c91d1af10d69c0b4c3b49edd07284a5852330 | |
| parent | 3e60501f311c50bf234033f206c19d34d889df01 (diff) | |
| download | ffmpeg-50493f1f7d2235db811d2991b9e5b330baf7c05a.tar.gz | |
twinvq: fix out of bounds array access
ModeTab.fmode has only 3 elements, so indexing it with ftype
in the initialier for 'size' is invalid when ftype == FT_PPC.
This fixes crashes with gcc 4.8.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4bf2e7c5f1c0ad3997fd7c9859c16db8e4e16df6)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
| -rw-r--r-- | libavcodec/twinvq.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/twinvq.c b/libavcodec/twinvq.c index 6d0a0ec9c9..c58a9bc75d 100644 --- a/libavcodec/twinvq.c +++ b/libavcodec/twinvq.c @@ -1000,14 +1000,16 @@ static av_cold void construct_perm_table(TwinContext *tctx, int ftype) { int block_size; const ModeTab *mtab = tctx->mtab; - int size = tctx->avctx->channels*mtab->fmode[ftype].sub; + int size; int16_t *tmp_perm = (int16_t *) tctx->tmp_buf; if (ftype == FT_PPC) { size = tctx->avctx->channels; block_size = mtab->ppc_shape_len; - } else + } else { + size = tctx->avctx->channels * mtab->fmode[ftype].sub; block_size = mtab->size / mtab->fmode[ftype].sub; + } permutate_in_line(tmp_perm, tctx->n_div[ftype], size, block_size, tctx->length[ftype], |