RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_weave: Fix odd height handling 

Fixes: out of array access
Fixes: tickets/10743/poc10ffmpeg

Found-by: Zeng Yunxiang and Li Zeyuan
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 0ecc1f0e48)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2023-12-22 12:31:35 +01:00
parent 643e5f1dcb
commit e65bae8a19
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavfilter/vf_weave.c
View File

@ -30,6 +30,7 @@ typedef struct WeaveContext {
int double_weave;
int nb_planes;
int planeheight[4];
int outheight[4];
int linesize[4];
AVFrame *prev;
@ -72,6 +73,9 @@ static int config_props_output(AVFilterLink *outlink)
s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h);
s->planeheight[0] = s->planeheight[3] = inlink->h;
s->outheight[1] = s->outheight[2] = AV_CEIL_RSHIFT(2*inlink->h, desc->log2_chroma_h);
s->outheight[0] = s->outheight[3] = 2*inlink->h;
s->nb_planes = av_pix_fmt_count_planes(inlink->format);
return 0;
@ -104,14 +108,15 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
field1 = weave ? s->first_field : (!s->first_field);
field2 = weave ? (!s->first_field) : s->first_field;
for (i = 0; i < s->nb_planes; i++) {
const int compensation = 2*s->planeheight[i] > s->outheight[i];
av_image_copy_plane(out->data[i] + out->linesize[i] * field1,
out->linesize[i] * 2,
in->data[i], in->linesize[i],
s->linesize[i], s->planeheight[i]);
s->linesize[i], s->planeheight[i] - compensation * field1);
av_image_copy_plane(out->data[i] + out->linesize[i] * field2,
out->linesize[i] * 2,
s->prev->data[i], s->prev->linesize[i],
s->linesize[i], s->planeheight[i]);
s->linesize[i], s->planeheight[i] - compensation * field2);
}
out->pts = s->double_weave ? s->prev->pts : in->pts / 2;