From patchwork Tue Nov 7 12:58:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 44547 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7aa7:b0:181:818d:5e7f with SMTP id u39csp288824pzh; Tue, 7 Nov 2023 04:59:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IHIGtLX2pa/hNBjuJgvRNb1L8K46dAzlNQ8GO6rI13QvefKh/uCB/3k3mbLn1zksPwl9SlU X-Received: by 2002:a17:907:845:b0:9d3:608d:cdf6 with SMTP id ww5-20020a170907084500b009d3608dcdf6mr16042268ejb.19.1699361985140; Tue, 07 Nov 2023 04:59:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699361985; cv=none; d=google.com; s=arc-20160816; b=ZZSnHHWYGJIrzoeSbL0art61myQ+FFtIKY2w4Ao+BYfzmZxkARvcXYfh62l50HLByZ ZHZUUUYmt0qdVcooQkaAOI7FKZa9sFoTSOHGNn4x5FMUUl77g5Mv6M6gWSk06FTzPa5k AQpFItVP6CNhLWb9y4RNwuJ2++EYgtblcmSmNIKn5ojLdCareypduzesr6TyDo0JXFlS q+3HP7ejyxXcNI0vzGgkxj+C9lxv7Hpy7brEMZ0t49IPDmwjyixf5Px3XTivRDMCqSDS M8wMbkY+H87SlQxJs2fbQ9sisVyNhbwa/Cs6/iHlASMUW/21AL5U2F3QkbKYsYmLTh6D GfCA== 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 :delivered-to; bh=lvgy9oTBBTlLx3/gVZ/2AVu9mHaVDR3AvBF68wfvcrE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=lbjKBI+YzjEt5b94RwsJbVvqCJIiq9E/Z4gbqSmdATDcSJdGOTJ4r3UmSEVt5oSZvH HuNDuudADMBAfKk/0uQoHFUvLFiFABMyPRb4F5xaQuxCp2Ds6B6qOBAVVNB0fZy9+Ywv V5A7IflhawDGaU7rwebKCdL2nt1wfTRaNPKCHJprJLxHaQurp2egfqifm+ApF+CxTuvO xazGfh0yX+p9XnWxLJhTk3HEdtHsZBaoZ8msTOmFKlSSy/RxntVTh7S7GOJfWfD7B9VG LuoMtTXXFwUpCcBxoLu1I/j3S0lnpn/oxsO0A5sBefZEB/k0feZ83Z/C/Cc9YePBlsZE +sWQ== ARC-Authentication-Results: i=1; mx.google.com; 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 mp21-20020a1709071b1500b0099bc62f3629si1078027ejc.567.2023.11.07.04.59.40; Tue, 07 Nov 2023 04:59:45 -0800 (PST) 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; 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 2407168CADC; Tue, 7 Nov 2023 14:59:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C60368C97F for ; Tue, 7 Nov 2023 14:59:13 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 05A171102 for ; Tue, 7 Nov 2023 13:59:13 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 6vDeDrBcaeP1 for ; Tue, 7 Nov 2023 13:59:12 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (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 "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 34EA11344 for ; Tue, 7 Nov 2023 13:59:12 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 085993A02E1 for ; Tue, 7 Nov 2023 13:59:05 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Nov 2023 13:58:32 +0100 Message-ID: <20231107125835.25827-1-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] fftools/cmdutils: only set array size after allocation succeeded 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: PArB0AtLVPga --- fftools/cmdutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 156c13801a..86cd3bddb4 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -665,10 +665,10 @@ static int init_parse_context(OptionParseContext *octx, memset(octx, 0, sizeof(*octx)); - octx->nb_groups = nb_groups; - octx->groups = av_calloc(octx->nb_groups, sizeof(*octx->groups)); + octx->groups = av_calloc(nb_groups, sizeof(*octx->groups)); if (!octx->groups) return AVERROR(ENOMEM); + octx->nb_groups = nb_groups; for (i = 0; i < octx->nb_groups; i++) octx->groups[i].group_def = &groups[i];