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 C1D7A4A833 for ; Tue, 11 Jun 2024 05:36:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1173068D77C; Tue, 11 Jun 2024 08:35:58 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9128268D614 for ; Tue, 11 Jun 2024 08:35:51 +0300 (EEST) Authentication-Results: mail0.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=SvJeQKV6; dkim-atps=neutral Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id E9267240DAC; Tue, 11 Jun 2024 07:35:49 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 3DkFBAqK2yMt; Tue, 11 Jun 2024 07:35:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1718084149; bh=rfhgjnkuPOK68EcPNhTSJUGt7PBHryUodCa+oPAI/b8=; h=Subject:From:To:Cc:In-Reply-To:References:Date:From; b=SvJeQKV6W/WLKhqymS/uhsMemB+KUHopq8P76HXyrG5kwF+2NVYLVsx8VhxIEvYjq d3e/9FR7bNEMZySM0tZLUs432CYNO6l3ch1pO+Nhwdh266v1f+VRhJSc+S51Ez83vb R/Kr1MhhQOdcL/Rvs38Q+gmu1Pu8l+zQC1ePhSqEWS0ehAtFOVVVdsGI8VSDgDFHlz PncPQ4UPKc7K0IcSmFVefIVDYuS10SlT0O+u31m2t54RhTKQ2OvC1kfqWrhKt4e8uZ uQGCFuStq5Wz4HVVXGig5Bpy1aL/UmTBiO9fJ/3cl99aimgZt39GaO8smjOpsQ5Fos jqUHCTeuYGC1w== Received: from lain.khirnov.net (lain.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 50E292404E5; Tue, 11 Jun 2024 07:35:49 +0200 (CEST) Received: by lain.khirnov.net (Postfix, from userid 1000) id 2E8761601B9; Tue, 11 Jun 2024 07:35:49 +0200 (CEST) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: References: Mail-Followup-To: FFmpeg development discussions and patches , Andreas Rheinhardt Date: Tue, 11 Jun 2024 07:35:49 +0200 Message-ID: <171808414916.28895.5972303409307279598@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg_mux_init: Return error upon error 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: Andreas Rheinhardt 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: Quoting Andreas Rheinhardt (2024-06-10 15:24:49) > Currently it may return an uninitialized value. > Introduced in 840f2bc18eddd72fa886aec30efc82991b920c45. > Fixes Coverity issue #1603565. > > Signed-off-by: Andreas Rheinhardt > --- > fftools/ffmpeg_mux_init.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c > index b1cb6cf7bd..1953655135 100644 > --- a/fftools/ffmpeg_mux_init.c > +++ b/fftools/ffmpeg_mux_init.c > @@ -3022,10 +3022,13 @@ static int parse_forced_key_frames(void *log, KeyframeForceCtx *kf, > unsigned int nb_ch = mux->fc->nb_chapters; > int j; > > - if (nb_ch > INT_MAX - size || > - !(pts = av_realloc_f(pts, size += nb_ch - 1, > - sizeof(*pts)))) > + if (nb_ch > INT_MAX - size) { > + ret = AVERROR(ERANGE); > goto fail; > + } > + pts = av_realloc_f(pts, size += nb_ch - 1, sizeof(*pts)); > + if (!pts) > + return AVERROR(ENOMEM); Looks good. Would look even better with the size increment outside of the av_realloc_f() call. -- Anton Khirnov _______________________________________________ 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".