[FFmpeg-devel] [PATCH] hwcontext_vulkan: fix memory leak in drm->vulkan mapping

[FFmpeg-devel] [PATCH] hwcontext_vulkan: fix memory leak in drm->vulkan mapping

[vytskalt via ffmpeg-devel]

From: vytskalt <vytskalt@protonmail.com>

If ff_vk_exec_discard_deps is not called after ff_vk_exec_add_dep_frame
we get a reference cycle causing the frames context to never be freed.

Same situation as in 74e27d9e3182d2d256d11bb0d5d45633b054bbcb

Signed-off-by: vytskalt <VytskaLT@protonmail.com>
---
 libavutil/hwcontext_vulkan.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
index 6d7df3e619..f0b0dcd0a4 100644
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -3426,8 +3426,12 @@ static int vulkan_map_from_drm_frame_sync(AVHWFramesContext *hwfc, AVFrame *dst,
             });
 
         err = ff_vk_exec_submit(&p->vkctx, exec);
-        if (err < 0)
+        if (err < 0) {
+            ff_vk_exec_discard_deps(&p->vkctx, exec);
             return err;
+        }
+
+        ff_vk_exec_wait(&p->vkctx, exec);
     } else
 #endif
     {
-- 
2.49.0


_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".