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 079E34BFC9 for ; Sat, 20 Jul 2024 00:53:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 21A1868DA6A; Sat, 20 Jul 2024 03:52:57 +0300 (EEST) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 941A568D982 for ; Sat, 20 Jul 2024 03:52:47 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id D2405240003 for ; Sat, 20 Jul 2024 00:52:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1721436767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gkWbttSiqZ6ZdyywkF+Q/k9U3XUSecsoGhnDbKOpNXI=; b=hAvnvFjKF26m4XKPnMTGLvgPBwe6W+Ktzw2Ms2wyaw1QvzDjR3IyzRfuRsj45xopo7b63i EB7ODz8MK4ewLbntNxDiFTBHdNCMinnDM7ZKrFozudTDxEobg62q4Uuln86o+9KEtAn5jb Z66P5yB4NIAZLQDlqRy5FQW8YD6WV2NDVphZ05vdgacssP2Mg1QYFnYDUxgAR4qzWKLwY2 7sHdn5i0x9XD8ib15ytRvDn5izvEszFIsWexQTtulm46HafA0iRvHlkQLnY9JO1tGkA1t+ xC7pW9c9GjcmYZoSDFiz7cKYEekkrcuGctBTeD0kx2iwepywZmLJ1o3Apgr+Vg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 20 Jul 2024 02:52:36 +0200 Message-ID: <20240720005241.726089-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240720005241.726089-1-michael@niedermayer.cc> References: <20240720005241.726089-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 06/11] avcodec/vaapi_encode: Check hwctx 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 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: Fixes: null pointer dereference Fixes: 70376/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_VAAPI_fuzzer-4733551250046976 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vaapi_encode.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 48ca0187758..afdf3fe3d8c 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -2307,12 +2307,14 @@ av_cold int ff_vaapi_encode_close(AVCodecContext *avctx) ff_refstruct_pool_uninit(&ctx->output_buffer_pool); if (ctx->va_context != VA_INVALID_ID) { - vaDestroyContext(ctx->hwctx->display, ctx->va_context); + if (ctx->hwctx) + vaDestroyContext(ctx->hwctx->display, ctx->va_context); ctx->va_context = VA_INVALID_ID; } if (ctx->va_config != VA_INVALID_ID) { - vaDestroyConfig(ctx->hwctx->display, ctx->va_config); + if (ctx->hwctx) + vaDestroyConfig(ctx->hwctx->display, ctx->va_config); ctx->va_config = VA_INVALID_ID; } -- 2.45.2 _______________________________________________ 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".