virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

avfilter/vf_deshake_opencl: Use AV_VIDEO_MAX_PLANES

Browse Source 
Fixes: CID1452758 Out-of-bounds read (actual out of bounds access depends on a frame with more than 3 planes)

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2024-06-14 01:08:50 +02:00
parent 9b9e02f2ff
commit c37dc63c7d
No known key found for this signature in database
GPG Key ID: B18E8928B3948D64
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/vf_deshake_opencl.c
View File

@ -1387,8 +1387,8 @@ static int filter_frame(AVFilterLink *link, AVFrame *input_frame)
size_t global_work[2];
int64_t duration;
cl_mem src, transformed, dst;
cl_mem transforms[3];
CropInfo crops[3];
cl_mem transforms[AV_VIDEO_MAX_PLANES];
CropInfo crops[AV_VIDEO_MAX_PLANES];
cl_event transform_event, crop_upscale_event;
DebugMatches debug_matches;
cl_int num_model_matches;
@ -1518,7 +1518,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *input_frame)
transforms[0] = deshake_ctx->transform_y;
transforms[1] = transforms[2] = deshake_ctx->transform_uv;
for (int p = 0; p < FF_ARRAY_ELEMS(transformed_frame->data); p++) {
for (int p = 0; p < AV_VIDEO_MAX_PLANES; p++) {
// Transform all of the planes appropriately
src = (cl_mem)input_frame->data[p];
transformed = (cl_mem)transformed_frame->data[p];
@ -1619,7 +1619,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *input_frame)
crops[0] = deshake_ctx->crop_y;
crops[1] = crops[2] = deshake_ctx->crop_uv;
for (int p = 0; p < FF_ARRAY_ELEMS(cropped_frame->data); p++) {
for (int p = 0; p < AV_VIDEO_MAX_PLANES; p++) {
// Crop all of the planes appropriately
dst = (cl_mem)cropped_frame->data[p];
transformed = (cl_mem)transformed_frame->data[p];