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

avfilter/vf_avgblur_opencl: Use AV_VIDEO_MAX_PLANES 

Fixes: CID1437470 Out-of-bounds read (out of bounds read would only occur with a pixel format of more than 4 planes)

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2024-06-13 00:22:09 +02:00
parent 989e11acb6
commit ffba528bc6
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/vf_avgblur_opencl.c
View File

@ -47,8 +47,8 @@ typedef struct AverageBlurOpenCLContext {
FilterParam luma_param;
FilterParam chroma_param;
FilterParam alpha_param;
int radius[4];
int power[4];
int radius[AV_VIDEO_MAX_PLANES];
int power[AV_VIDEO_MAX_PLANES];
} AverageBlurOpenCLContext;
@ -101,7 +101,7 @@ static int avgblur_opencl_make_filter_params(AVFilterLink *inlink)
s->radiusV = s->radiusH;
}
for (i = 0; i < 4; i++) {
for (i = 0; i < AV_VIDEO_MAX_PLANES; i++) {
s->power[i] = 1;
}
return 0;
@ -133,7 +133,7 @@ static int boxblur_opencl_make_filter_params(AVFilterLink *inlink)
s->power[U] = s->power[V] = s->chroma_param.power;
s->power[A] = s->alpha_param.power;
for (i = 0; i < 4; i++) {
for (i = 0; i < AV_VIDEO_MAX_PLANES; i++) {
if (s->power[i] == 0) {
s->power[i] = 1;
s->radius[i] = 0;
@ -191,7 +191,7 @@ static int avgblur_opencl_filter_frame(AVFilterLink *inlink, AVFrame *input)
goto fail;
}
for (p = 0; p < FF_ARRAY_ELEMS(output->data); p++) {
for (p = 0; p < FFMIN(FF_ARRAY_ELEMS(output->data), AV_VIDEO_MAX_PLANES); p++) {
src = (cl_mem) input->data[p];
dst = (cl_mem) output->data[p];
inter = (cl_mem)intermediate->data[p];