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 5FB9049850 for ; Tue, 20 Feb 2024 12:09:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 66C6D68D083; Tue, 20 Feb 2024 14:09:18 +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 8505868CE0F for ; Tue, 20 Feb 2024 14:09:11 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1708430942; bh=NMuQDgPjT4x7Ni/ZXMqCdhc81WxbUD0EjaP2abmQMOc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gfSts2UO+vNqhCSI5oYY3vWZWRZWN5lvOAJH3QE9SILU9qonyb5LDCRoS2VUfDHFO bp25Dg88v8wr7/HYhMXMRxjdAqMhrtzezedEReo9RBOa4VtNfF28MMeV6W/cJxlWNC uvrXUlcYrK811+x/PeQFegTX04WZkYrVXzPRsa/Y= Received: from localhost.localdomain ([113.116.31.63]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id 2413D432; Tue, 20 Feb 2024 20:09:01 +0800 X-QQ-mid: xmsmtpt1708430942tsb20xhzu Message-ID: X-QQ-XMAILINFO: Mm/8i8/T4ynetaGveWD+gPWZE5TWATmFs/bLS1DN1GT6ZOJgzz+DsXimqjxK3n rZrVqndn+iwd49/w4/4peTMvKVBfRRPbMtjimuhVfZjZkGWZ6KrGbjUl+cBuymGxxtvvXvw0FSDX AveBRNars4fF3zcKIm4tG8zSWpWPGgs3oNDTQIFJXKQp+QKBrDdMPL80yGUD8Lm6f9OylSOi7BW1 Sd58zB3zyZ7vT3/PM8sNPyjKq7ZQa9l8O/W96/KucCKlie66nNSDBLVaouWcm/9b1Q2UkqYM9E+x tfgtq4fbvl2U0A9rlmUG/jwvkRny/TwDOF+EFmCZSfh2l5IWX78AFmrw5vSrZDwhsVdZKz6vnnex Am4YZbE8GOMgjyGI2CwKTYDpPHysMXPbxxT7/rCxdKbXT2e8AWC3E6PDc03PvkX9xnZOgbLdN5Wo pa8maAok+JAvq2Bm8mEAfR/1c5otDKcS56QoehsbKDN+sc2djD3N4xL8P4tDYrL9gzVNVcZC9Xmr mo+/13aZrjl5oQwGJtZpd3HjcC2txhd7mg0fUJVSFs6KS/LVNDiVfry8NHVloKbYMFyX3MHPAisN o2QrMirKfFi1bnLuAGAl3LfjUbPgzyUkEsgZwJBHDtoTMoJPso9TBb6MxYGLgklwV3htUwpSmoOl bipGoUeZ7K5hQrMjwrmDA7i3PiNLzDx0w6TmPuA/W8x5O0zVHnL5N6KyFWRO/O1EqSjXqAOMJYg8 DdZmafAkdFZCb6+ozvjlYsauqC84EFSXpVsPeZ06Y1/icgj2tweRWMmQZyUum31WrrTlKxoChAQB X32oKwybR8j2M6pXXTogLDgAYez8O7dxJbB4kj1UqR4U071brC0qxxEI9fnBta5PZAvQ62l6u+xl 8jXXz3bMTl8PmiGSEMnubQ/VAowrQAZSiq59KfuGt2JvX1gsK/HZdUghjmi/XU1XS26+UosdyGeU gwrImrA15shZhlfDaALPpSpiAJw7N9t+M2bPpV0Hy+NbszhtRyBkEI8AawXtLF X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Feb 2024 20:08:55 +0800 X-OQ-MSGID: <20240220120858.317766-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240220120858.317766-1-quinkblack@foxmail.com> References: <20240220120858.317766-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] avutil/hwcontext: Don't assume frames_uninit is reentrant 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 Fix heap use after free when vulkan_frames_init failed. --- libavutil/hwcontext.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index e8c6256a73..dec8b84783 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -360,7 +360,7 @@ int av_hwframe_ctx_init(AVBufferRef *ref) if (ctx->internal->hw_type->frames_init) { ret = ctx->internal->hw_type->frames_init(ctx); if (ret < 0) - goto fail; + return ret; } if (ctx->internal->pool_internal && !ctx->pool) @@ -370,14 +370,10 @@ int av_hwframe_ctx_init(AVBufferRef *ref) if (ctx->initial_pool_size > 0) { ret = hwframe_pool_prealloc(ref); if (ret < 0) - goto fail; + return ret; } return 0; -fail: - if (ctx->internal->hw_type->frames_uninit) - ctx->internal->hw_type->frames_uninit(ctx); - return ret; } int av_hwframe_transfer_get_formats(AVBufferRef *hwframe_ref, -- 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".