From patchwork Sat Apr 27 23:54:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 48309 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp1204878pzb; Sat, 27 Apr 2024 16:54:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVlk4pZIrCOEkdgPpCMju+rmLztFgkBMpurdVrVf8369aMR2/xOGGTDvnOiSFTsDFmU9ZXP/vOS5WSOWAtmkNTJeWist2JVSCXwMQ== X-Google-Smtp-Source: AGHT+IEk7aQyycPdqaK2xVY+Wd79468gPVnZodhpOjLqu5mhGgqhMzu9yZCBTrF8NJAVgB71zdZ1 X-Received: by 2002:a19:8c55:0:b0:51c:edd4:5236 with SMTP id i21-20020a198c55000000b0051cedd45236mr2286083lfj.55.1714262077168; Sat, 27 Apr 2024 16:54:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714262077; cv=none; d=google.com; s=arc-20160816; b=AN8aCawGo0iGtjosMY3u5K2JmYMdT9FR+lRbpY22kJ1v+9skiXE8zWCVyRrVReixIe FjmlXxD9i+ZlIHZ0yifMgbpnetoJSrJsssCIL/G3fOnLk+wEiTb9l9xHmVuzfYkDQezj RRYS37+t69HZ7mEVknHsYKzXwkdQDbetW0Mg+KcUK1JCrkLKgxfnN2ny3vM/o12H2ybm bP0lyWhQeV3PpOsc5UDjBcohb1EApQZiaKY3/rQRkcgDC7ucsOof9cIH3JrA68TBwFuk 6QmTAqYEyKKDAWAoNMxPHTlx4tl/oeQfYU1LZnZSv4/Dd8DD8TPiTLVey8w0QOfkoFuk 3tWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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:message-id:date:to:from :dkim-signature:delivered-to; bh=hU/pgAiXIkkdouNJr2WwYlQ2fwiqPrYZrsom6T0W1xQ=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=tb5nryBGhNeeYsrmVtynWnyXacf9AaEr/b/wBkATipgKcwTTCvR6DcmS7Z/4433TRl GnIYV3z10p/5sK3/2hwkGv+18E6K8SV+gbXtCPpNs2ipcAHHOa/aZ6vBfrZGO4ducHvR j3Q29R7Q0sl7uh2Nt52Z/gq1g1ambDPUuuwTYPL7qZ/gq3akDhRJzn0WgdcOgQKWnmdS 6uLW59hPUzEbtXns9QMYqccvfgSixMoAlhi4+8HYk3feMe5cjwz8LmuBEzXtHCiHL5ax PaEC9KIDOdB3YitpLdAIbXyt6QRZpy+atZ8uVemzPR3/ww8WE9xtHsDb0yOAOhz5W7G9 iCjw==; 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=Q7krBtxl; 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 hd17-20020a170907969100b00a571c511dbasi8196976ejc.445.2024.04.27.16.54.36; Sat, 27 Apr 2024 16:54:37 -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=Q7krBtxl; 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 C29B268D2EA; Sun, 28 Apr 2024 02:54:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F19D368C9CC for ; Sun, 28 Apr 2024 02:54:25 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 22F7E20003 for ; Sat, 27 Apr 2024 23:54:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1714262065; 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; bh=UKP08vNd9/FFnH7lCUk4Urxe1ly3sqkG+rzouGA/H8I=; b=Q7krBtxlrwpHetBxFkIbvwhsy+/m9hp/RXcBtTiWvHXReKs8jIa4tbQ8iv6rAOFMa79mmF F9wYeXjwST8388uO2gWjkeMsT4xAHVzourN7ty5D2mftdTBotO4aKhF+RySA/sWm2+o6fJ V9J1JEnrM0Ne42f5dECTdcNs3cvUK1/EUYmXzBget9Ylmmc7VDqPDiE0V0RXrJKfD95GZR YYxwtLLEnqnCQ9lAfhyBvi7MwP0loygJqW42pcfbnhkq4GS418OfLTaxRF+GG67Uac14Rs Bx2stM2bWRtI0J5DiFpvmf2P6RniGZ5BECmv/ZDSZxJReuXEfUTWYjs9Bvf05w== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 28 Apr 2024 01:54:15 +0200 Message-ID: <20240427235424.3075968-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 01/10] fftools/ffmpeg_enc: simplify opaque_ref check 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: Ar/KkFdKvAuW Found-while-revieweing: CID1520670 Dereference after null check Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- fftools/ffmpeg_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 618ba193ff5..863d1a43edd 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -476,7 +476,7 @@ void enc_stats_write(OutputStream *ost, EncStats *es, const FrameData *fd; - if ((frame && frame->opaque_ref) || (pkt && pkt->opaque_ref)) { + if (frame ? frame->opaque_ref : pkt->opaque_ref) { fd = (const FrameData*)(frame ? frame->opaque_ref->data : pkt->opaque_ref->data); tbi = fd->dec.tb; ptsi = fd->dec.pts;