[FFmpeg-cvslog] avcodec/cfhd: fix non-aligned to 8 height decoding

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Jul 31 09:42:47 2020 +0200| [f7e35c81636399c8caa6e3f18f33f149a944fb7c] | committer: Paul B Mahol

avcodec/cfhd: fix non-aligned to 8 height decoding

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f7e35c81636399c8caa6e3f18f33f149a944fb7c
---

 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);