diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2024-06-14 01:08:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2024-07-21 15:52:08 +0200 |
| commit | c37dc63c7dbd15d057144ad796fda685db684dac (patch) | |
| tree | 3a6c95469baa256a8775153a92e69ea5fe79af73 | |
| parent | 9b9e02f2ff6575e934e8e991a471b3086d1c0d53 (diff) | |
| download | ffmpeg-c37dc63c7dbd15d057144ad796fda685db684dac.tar.gz | |
avfilter/vf_deshake_opencl: Use AV_VIDEO_MAX_PLANES
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>
| -rw-r--r-- | libavfilter/vf_deshake_opencl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/vf_deshake_opencl.c b/libavfilter/vf_deshake_opencl.c index e49c808a8e..96e21a069f 100644 --- a/libavfilter/vf_deshake_opencl.c +++ b/libavfilter/vf_deshake_opencl.c @@ -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]; |