From patchwork Sun Sep 22 21:56:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 51713 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2142517vqb; Sun, 22 Sep 2024 15:24:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXrGjxN+6ycroSBR5oruX4k3wbGCcOXu+ybr94yrBbWfe3pgHrR8fwZna8ntXd5i8sbhz49Ed3AH/Y9NoMjWmeI@gmail.com X-Google-Smtp-Source: AGHT+IH3CBJEL6pXjeZrT57tDVGd/xlNi25xJ+NR42JcJy45NJlXF5R6eMa/vot2bP/qZlXn1H1j X-Received: by 2002:a05:6402:2481:b0:5bf:50:266b with SMTP id 4fb4d7f45d1cf-5c464a43d0cmr8457232a12.19.1727043855837; Sun, 22 Sep 2024 15:24:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727043855; cv=none; d=google.com; s=arc-20240605; b=GSUJj9h55mW9+2sWer5RFRR47H2Yvh5/TN1MEgvH5V+ERRp2qgn000bycS+fuimnvU eDGt8JDLwWqgc6eZZ2eUeJwA9aFOj0Ee8vhAhimDRtItwHH28q07QeTNL0hMTb+JaZwv 59LqTk7HT/jHD1KBIUVMsR2QIMeILpUfXXKJplHTRv8jPlxdHX6zsloTz+IkEJcinnhp M0wPJ0rS08IBsT+kiMRvqc1qOtlbPubnQqaWkGKtRXA0FzYDOlV/c3p9p0sMt5mJuc+V PQ1SFwJB96g8MgHrKpwAJVI1RM8KK3YPZBJgxoU9fvhuAUNyJmnsOWE9OIPqZRhpD9Bp sbvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=SXDVEYeXCHtuD+wUqHjwwpbPZisHzIr5+Jd2lJw4aw4=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=ZHtJ30bf4Jl1z9Q+pFMRnoZxjU1SynFUY7glCBZkWB/i6uvvkTc9M7xjWu3fn4KudV ueTnC0uWW/i5LPf6QGux3aFUhUxLrTCCaHPIbyHjBn15aln8dpK3rNyVgDLJu/VBgdbI tpUHOql9qsjy10wSZv7ZjtQHynumVeCEs8l91vvQMdZEghMIdoVGS+4GIfFeZhjrnbV4 /7Y1wSpQ27F29yte03VEJ2R/Hf+HKqkKPssL22Cu0czYSDH/kS9Uk+Kb4C7cme9NpBJ8 ZesN8576WTWqT8lZUWcVU5LuisNKqpRK+EC4JU0M/E22AUuWwzJB6QtgZdiImzIycbbY CMiw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=I1I2Hpv8; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5c42bcae36fsi12583364a12.586.2024.09.22.15.24.15; Sun, 22 Sep 2024 15:24:15 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=I1I2Hpv8; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC9EF68DB99; Mon, 23 Sep 2024 00:56:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F6D968DB2F for ; Mon, 23 Sep 2024 00:56:51 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 89AF4FF803 for ; Sun, 22 Sep 2024 21:56:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1727042210; 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=DPuDWlwcovXRV55rCmWjZMomCWe28HFpvcVpbISOJVc=; b=I1I2Hpv8gyIAExE4+3l4UyDeSrEyOges1gB7JXpV+0tlwRhRO7qTwKG7llkb8Zta750oXq 3zCRTmkuWeyX5rSkZUYzAj12RAaLfiIz7/EBbSUdSoDbl7gC99HcqtqUK7ZNPuwkmB8m9r ohORQA+f0ACu8uDoDBmEKaSPTUZaN1Oeq/ORaO0DOCNkqrpHtMhYpKstMu2TdXipqrVmkE HyxtCHc7NpOvxlKulyrQsrzuzXdG8TN6K6rgDUosd0WYsALAZybRAHCz/ZAq8NRaBbWHNd dFKn3Ri1dcAtHzQVO2s487TiioFXnsReB2zBjb1oGir1ivEcTMOEM47RTWeNMw== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 22 Sep 2024 23:56:40 +0200 Message-ID: <20240922215645.1182935-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240922215645.1182935-1-michael@niedermayer.cc> References: <20240922215645.1182935-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 05/10] avcodec/vvc/thread: Check frame to be non NULL 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: nuFOL9m0XrMb Fixes: NULL pointer dereference Fixes: 71303/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VVC_fuzzer-4875859050168320 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vvc/thread.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/vvc/thread.c b/libavcodec/vvc/thread.c index 86a7753c6a4..2bf9adc462e 100644 --- a/libavcodec/vvc/thread.c +++ b/libavcodec/vvc/thread.c @@ -837,7 +837,8 @@ int ff_vvc_frame_wait(VVCContext *s, VVCFrameContext *fc) ff_cond_wait(&ft->cond, &ft->lock); ff_mutex_unlock(&ft->lock); - ff_vvc_report_frame_finished(fc->ref); + if (fc->ref) + ff_vvc_report_frame_finished(fc->ref); #ifdef VVC_THREAD_DEBUG av_log(s->avctx, AV_LOG_DEBUG, "frame %5d done\r\n", (int)fc->decode_order);