From 95acbd8403bcdd1b9fbe25720fddb06433f3ef08 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 31 Jul 2020 09:42:47 +0200 Subject: [PATCH 2/5] avcodec/cfhd: fix non-aligned to 8 height decoding --- libavcodec/cfhd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index 91f4cc7e46..aa6e2ebee7 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -338,16 +338,16 @@ static int alloc_buffers(AVCodecContext *avctx) s->plane[i].stride = stride; w8 = FFALIGN(s->plane[i].width / 8, 8); - h8 = height / 8; + h8 = FFALIGN(height, 8) / 8; w4 = w8 * 2; h4 = h8 * 2; w2 = w4 * 2; h2 = h4 * 2; s->plane[i].idwt_buf = - av_mallocz_array(height * stride, sizeof(*s->plane[i].idwt_buf)); + av_mallocz_array(FFALIGN(height, 8) * stride, sizeof(*s->plane[i].idwt_buf)); s->plane[i].idwt_tmp = - av_malloc_array(height * stride, sizeof(*s->plane[i].idwt_tmp)); + av_malloc_array(FFALIGN(height, 8) * stride, sizeof(*s->plane[i].idwt_tmp)); if (!s->plane[i].idwt_buf || !s->plane[i].idwt_tmp) return AVERROR(ENOMEM); -- 2.26.2