From patchwork Fri Jul 5 00:21:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50353 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp4006736vqv; Thu, 4 Jul 2024 17:44:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV5ldMvt83ljAf9eX1GwqQ1Y9CaubejJ6hbjU6oYSmSMBg7QjWamqwB5/cqkZ9qq+qm/TTgvAg7hDymAMxLQzWyNHo90lnYWmnyNA== X-Google-Smtp-Source: AGHT+IEjWip7xcLXM4w3jZyxSFcRcJ8vlm9PAHkVebwV3CA8gFFTX5teWdkfuvEeWGNTII0WFsJQ X-Received: by 2002:ac2:554f:0:b0:52e:98f6:c21f with SMTP id 2adb3069b0e04-52ea064b29cmr2027611e87.16.1720140250731; Thu, 04 Jul 2024 17:44:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720140250; cv=none; d=google.com; s=arc-20160816; b=qujgczAlgqpbzT1IvK+3YK9vj0IA4kyiE1HUmwG3j+2ZgLmL4MVIiimd6PO9FIwLg7 Dh3F9nPi3KL1YpiVXwpwLUeSbb0WSJ6yElQzrpAu9us9ilTs6C+xLHD2xKRK2vSOxoxP WbOkJgq5/YJYVGEYvuZz0dXYO/E6jyXb7uBYctHlaA6GmqwxzFyGNbd6BDKO2hSkiI0d 9poyq9OAL1dD6Fd4ZyzQ/Z3Mz98YQbcW7wP+31q2KbriI+1+iVCl6BOC1goZ7VgiKq30 GHI7o/FJGKEpYd43r1aLLw/k90GGTztjaIeR3mPiLth4++/6V1lo36DGHvsDZwGxoNt9 twLw== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=ZjbeWTZEQayAtxhlBazVS5f1GufoW3HW7dRixzsmlNc=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=NgD7ptmnqbfnKszjnEo5QSKrFRZf6dr0CmGrcnmWJ+Lg1WgO+1Pgv0wiTxrnEMdN0C iU9et9IX2pChDBtFiQPdOR0ZtocgA9qAUDNhTZTBSqAmxTbw7ps0+IENxrsk/ObosijP QqUpyRIqCzlRnOlImOdGpQ8GRq/wAznG+SA5IQudyvSmmjnP5Rd+k+KHAX6FQXmJ3iNo 2u3HVea5W+/+HGIrN2wByOpNnLHWdnabfNEd6Glc9DgDluQiU+k9ThB+GTphSpvrqg5u USaXngkZGfeFGbRRd4/JhAf6UTQd6B90TTBW+oroN75bFFNTTK1Y4czAe2pa9/TsHJTG b7nQ==; 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="CT/UKiut"; 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 a640c23a62f3a-a72ab096abcsi712846166b.810.2024.07.04.17.44.10; Thu, 04 Jul 2024 17:44:10 -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="CT/UKiut"; 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 C59C168DB01; Fri, 5 Jul 2024 03:22:20 +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 E16BA68DAD1 for ; Fri, 5 Jul 2024 03:22:01 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 496D7FF804 for ; Fri, 5 Jul 2024 00:22:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1720138921; 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=2ruXtfqzpnmwdBotLpBRhcE6u2pEu1FAWDBvjrVNYgM=; b=CT/UKiutzE10yagoX/JJy7WAYrqr2p0Wcl88Y4Shd/H0fBom1xocUPJQe0/CczMLyFA0ak CMW+bYymgI8xxxAUc5Rq59EUQCKceJ/o5LSqPRIMp9sTHmxWUEoLZIPolQCDhiVWDtVU5i S5mNSRfAIWFuF6hFjTNoAuFw3TiaBK0EBBNZDWodmvhEd0JQRCn2IP+qRHqg07UC+UpjKT UjLAdn192HyMbTa2NPvTLghyXGBfoXdm+3QNkUAjoy88SyWYB5Lgs/eSC5336t0hf8kNzU cowAaK3LbTcarZXDfb4BZG4Uar86TcbjMaPnZKNYpltHY864NwSg5Kj+HtyE5g== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 5 Jul 2024 02:21:47 +0200 Message-ID: <20240705002156.1964272-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240705002156.1964272-1-michael@niedermayer.cc> References: <20240705002156.1964272-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 06/15] avcodec/hw_base_encode: Simplify EOF 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: rYNMRvmeAZ86 Found while reviewing CID1608712 Explicit null dereferenced Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/hw_base_encode.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/hw_base_encode.c b/libavcodec/hw_base_encode.c index ecb4be6aa43..6d5632c2988 100644 --- a/libavcodec/hw_base_encode.c +++ b/libavcodec/hw_base_encode.c @@ -546,11 +546,10 @@ start: } err = ff_encode_get_frame(avctx, frame); - if (err < 0 && err != AVERROR_EOF) - return err; - - if (err == AVERROR_EOF) + if (err == AVERROR_EOF) { frame = NULL; + } else if (err < 0) + return err; err = hw_base_encode_send_frame(avctx, ctx, frame); if (err < 0)