From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id BB51446F2C for ; Thu, 22 Feb 2024 14:43:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D0B6A68D1B4; Thu, 22 Feb 2024 16:43:02 +0200 (EET) Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1FEC68C539 for ; Thu, 22 Feb 2024 16:42:55 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1708612966; bh=Clnwt77aCc3dZe7FiI07Ue/TA+TNEA3TKDC5sy9zPUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UhzrRr/4D6Y+VTjjXGp1bl2lYfZlmv5YkUPRB0fD/uSb5Ihx0hPMHw9QXLLoZPLhB jMwuPw7xSXMxY9wyXfNwfOiUmANVqWnUvoI8GV3HbIx4Orj6yx6potHDzT+Ucf7TTd d13Uyg/d9vfMRnA2nJKXDjaKa71GfqLdUvWOB12Y= Received: from localhost.localdomain ([113.118.106.125]) by newxmesmtplogicsvrsza1-0.qq.com (NewEsmtp) with SMTP id AADBE486; Thu, 22 Feb 2024 22:42:45 +0800 X-QQ-mid: xmsmtpt1708612965tn5o9lxea Message-ID: X-QQ-XMAILINFO: OQhZ3T0tjf0aNQtsHtgPWXvwuYisMWo/OohOauLkzkkvWDztrQccTCesCdWU8G kkDWl+9hx/h7XFC54Az/UtjK08ssbFKWmztvU182Qhm+sVfj059Rn/5Hi3KreNUJQ2Gsnf3EAMGq hwfiKdug1lo135HrYVaVABXfZAQt3kZq/TNv72QsUa0cKU38c0GfLmpEWTxDFLsXTSKVKgx5nIDb TMbzWjae2DDfAHc+mzX11qAgtemBMbTXvHQDEgS61i4wL93yzd/iz2nTvviJ/XqwXO806nQhjf+2 FyQxASoG1QWc9ng3ejtN4qR/1SBZqJCvsn4uPyzvvfbcx2tWG55AgTSPll4MQVhI5zZvUmRz07wG xDj7he+2N/8rTtjcMpwl4HxRJbgdccNFMEtRC20ah+mQ+/Bf8dEhVqX+Z2kCwqnAfN2t0Tx/F6A2 /K3GMOKYgEWP6iW9035PGlI7Pul3ED3CVUKD7H+F3JvcJHrIyYFk59JomzFV1QkEt3ANs5h+8EEB pcSyDhsa2k4MQfTtb/l79u1kOsO8loXi+WjI2Bf3MEf2ApZ6uiMKJEB6Wa4A8Y9M9H6PEmG88BEq uQaO+emU4/S3uJxJvnBMc5CI5ve3Ned88EaETpjQh1H3HT8xOcRCtJ/A5KWSXOXkD7KGRdK6tXOq YxtJ1Dkx5kBZ3gQYfdgANunq9tn4+6du8M1z5NrHKpdFCuKx6sDvs93PGpzen+m6yQsdcc+67dOC smxt/uojxBwoVGZ1I6Typy/ndfjysEnEa56W2GCmUOpJHVRSRJgyk59RqI8eD7CK6bJqQ0EJlnJ7 ahbe238VsmyX+TH62/jK9P0Mj2Q5Y53Iu347C2He0CXQ0DW8WsOf6zCBSzdOckoHuDuPujaPeOcY zqxTK1/APThaaSI5juTJM9MTcyqHBjZs13PvbD0MpkjWQ5KhAJJzsG7VXwPd+L12zhLas2kdT5yh 3XtJtZEQPuL1lXB4ws+8+ylGwniJABG7oY/NUCtzNa3EMXPWKXrg== X-QQ-XMRINFO: Mp0Kj//9VHAxr69bL5MkOOs= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Feb 2024 22:42:42 +0800 X-OQ-MSGID: <20240222144242.16111-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/5] avutil/hwcontext_vulkan: Fix leaks when semaphore creation fails X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Zhao Zhili --- libavutil/hwcontext_vulkan.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index d660f63afe..ee13788ead 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -1807,16 +1807,22 @@ static void vulkan_frame_free(AVHWFramesContext *hwfc, AVVkFrame *f) VulkanDevicePriv *p = hwfc->device_ctx->internal->priv; FFVulkanFunctions *vk = &p->vkctx.vkfn; int nb_images = ff_vk_count_images(f); + int nb_sems = 0; + + while (nb_sems < FF_ARRAY_ELEMS(f->sem) && f->sem[nb_sems]) + nb_sems++; + + if (nb_sems) { + VkSemaphoreWaitInfo sem_wait = { + .sType = VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO, + .flags = 0x0, + .pSemaphores = f->sem, + .pValues = f->sem_value, + .semaphoreCount = nb_sems, + }; - VkSemaphoreWaitInfo sem_wait = { - .sType = VK_STRUCTURE_TYPE_SEMAPHORE_WAIT_INFO, - .flags = 0x0, - .pSemaphores = f->sem, - .pValues = f->sem_value, - .semaphoreCount = nb_images, - }; - - vk->WaitSemaphores(hwctx->act_dev, &sem_wait, UINT64_MAX); + vk->WaitSemaphores(hwctx->act_dev, &sem_wait, UINT64_MAX); + } vulkan_free_internal(f); @@ -2098,7 +2104,8 @@ static int create_frame(AVHWFramesContext *hwfc, AVVkFrame **frame, if (ret != VK_SUCCESS) { av_log(hwctx, AV_LOG_ERROR, "Failed to create semaphore: %s\n", ff_vk_ret2str(ret)); - return AVERROR_EXTERNAL; + err = AVERROR_EXTERNAL; + goto fail; } f->queue_family[i] = p->nb_img_qfs > 1 ? VK_QUEUE_FAMILY_IGNORED : p->img_qfs[0]; -- 2.34.1 _______________________________________________ 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".