aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2019-10-19 11:56:02 +0200
committerJames Almer <jamrial@gmail.com>2021-09-13 16:50:33 -0300
commitd60effdf83eddcdb18c84d339a526fb0318723fe (patch)
tree2b28894727088a871faccce6ca6210d87f451367
parentc79606f233fed20a6d31e6cd5f24466021eaf94b (diff)
downloadffmpeg-d60effdf83eddcdb18c84d339a526fb0318723fe.tar.gz
avfilter/vf_fieldmatch: fix heap-buffer overflow
Also fix use of uninitialized values. Fixes #8239 (cherry picked from commit ce5274c1385d55892a692998923802023526b765) Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavfilter/vf_fieldmatch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/vf_fieldmatch.c b/libavfilter/vf_fieldmatch.c
index 5a73eb43b8..8d1e68b85f 100644
--- a/libavfilter/vf_fieldmatch.c
+++ b/libavfilter/vf_fieldmatch.c
@@ -938,7 +938,7 @@ static int config_input(AVFilterLink *inlink)
fm->tpitchy = FFALIGN(w, 16);
fm->tpitchuv = FFALIGN(w >> 1, 16);
- fm->tbuffer = av_malloc(h/2 * fm->tpitchy);
+ fm->tbuffer = av_calloc((h/2 + 4) * fm->tpitchy, sizeof(*fm->tbuffer));
fm->c_array = av_malloc((((w + fm->blockx/2)/fm->blockx)+1) *
(((h + fm->blocky/2)/fm->blocky)+1) *
4 * sizeof(*fm->c_array));