From patchwork Thu Aug 8 13:05:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13757438 Received: from fout7-smtp.messagingengine.com (fout7-smtp.messagingengine.com [103.168.172.150]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4CA2518CBF3 for ; Thu, 8 Aug 2024 13:05:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=103.168.172.150 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723122331; cv=none; b=buo03Uv3x2z4KH1yN1/FcrGXtR+snJDqXaJ8Tt1gYue2ag0TxV10Si2cY06EeQPhMhdGCWyAM14JuvdpsBzo6XGFgmzMBi1SaLy+0Lvp56in218lwdIqn1acmdNW0TNWT2Z6fr2b2m5MKJZ5MzA8C7PwfUGT3quJOS1prA4qwGU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723122331; c=relaxed/simple; bh=cCknkQ8cHC0BKnLO+GyFMAEBzfkKukdmjxl2sHXBlso=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=qCOqPwLSEsyVNcX2rkQq1e4hdI5yUYgPZ1rBZXXnzFnkIGdtkGeDtq+Xj8N8lnYJIXdv45+4V4BUAwvlumPmxekJkRiDGR+Iikh95Okko34HwK1Ig9xod4RsjZZUGSplGMhXpk6mn1yiituDQmYO7U2pmW//t7rmitf5kVhMHG4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im; spf=pass smtp.mailfrom=pks.im; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b=A8J1KAeA; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=RH1lNHOq; arc=none smtp.client-ip=103.168.172.150 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=pks.im Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pks.im Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="A8J1KAeA"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="RH1lNHOq" Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailfout.nyi.internal (Postfix) with ESMTP id A6C1B138FC76; Thu, 8 Aug 2024 09:05:29 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 08 Aug 2024 09:05:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1723122329; x=1723208729; bh=xNKkWx7spq eIMsc2GxyV4YNLE+UzI9aCWagrMeyvfBE=; b=A8J1KAeAoj5w4hMaLO7u+dKkix wYgQcCcUNWRm4Lf1p/YCeUK0kAetHc9qEpTH4AExv5WopHME8A7Up8b0uxN8XWZ9 rHAC8yD9KmbF8qs1+UrxvK9bXQwd982yDNvJE5LEW9KFPE4ra74RB/+FlddHmpz6 MKERjTIqgvzVgpmenvWvWxTfnEcW6Oagsh0usVQ5S37WJpwCRHwZBYyGVpgmgKhR St1SpWsTZ60UuGTNvgnqe9e+y4CHDR6koSpEPQQcpqlpq1CXPCgaUfOK37FW+8Du nJqf1eo7F9Y5Hiu1oglXaJAom22jgwfy64I02d0Xsi+Dtb2Rzt9WLdTII51Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1723122329; x=1723208729; bh=xNKkWx7spqeIMsc2GxyV4YNLE+Uz I9aCWagrMeyvfBE=; b=RH1lNHOqg3qw2TYMMp/CL4hEuoo8mK0Kuuptp2CFRXrq XmajCM16Q4Nz0hx5CUwLArUswVvmrkzBmw2LmSGWManw1viIAewlJgSIft73MJG3 elU+JjJ0Xtod/CFH3/U4aXq7jtkOrPt80mPJKu/fvd/b5DbFvq0FqtdnjeoLzkuS 4zx6pcSu7MMQI0v/tG0GuCyekSkzIfhf4/1pgWyUS7FfRYxP63r6h857UZO20ZSG MfqY9eaWIWxHVJ5q/kb4+rd1OA7mrizl6YpgnrYyUMwV+mf/gWyd+mVjqT4x9wnm WAz2fR+ZBRcQ5VhMptYwpsgp6No+8i6dSODEqM79mQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrledvgdeitdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnth hsucdlqddutddtmdenucfjughrpeffhffvvefukfhfgggtuggjsehgtderredttddvnecu hfhrohhmpefrrghtrhhitghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqe enucggtffrrghtthgvrhhnpeegieffjeekteeluefhteetheegueethfetuefgtdeuffdt hfekueekkeeuvdeileenucffohhmrghinhepughifhhfohhpthdrnhhonecuvehluhhsth gvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhssehpkhhsrdhimhdp nhgspghrtghpthhtohepfedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepghhith esvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhopehjrghmvghssehjrghmvghs lhhiuhdrihhopdhrtghpthhtohepphhhihhllhhiphdrfihoohguuddvfeesghhmrghilh drtghomh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 8 Aug 2024 09:05:28 -0400 (EDT) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 752174d2 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 8 Aug 2024 13:05:21 +0000 (UTC) Date: Thu, 8 Aug 2024 15:05:26 +0200 From: Patrick Steinhardt To: git@vger.kernel.org Cc: James Liu , Phillip Wood Subject: [PATCH v2 12/22] builtin/fast-export: fix leaking diff options Message-ID: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Before caling `handle_commit()` in a loop, we set `diffopt.no_free` such that its contents aren't getting freed inside of `handle_commit()`. We never unset that flag though, which means that it'll ultimately leak when calling `release_revisions()`. Fix this by unsetting the flag after the loop. Signed-off-by: Patrick Steinhardt --- builtin/fast-export.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 4b6e8c6832..fe92d2436c 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -1278,9 +1278,11 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix) revs.diffopt.format_callback = show_filemodify; revs.diffopt.format_callback_data = &paths_of_changed_objects; revs.diffopt.flags.recursive = 1; + revs.diffopt.no_free = 1; while ((commit = get_revision(&revs))) handle_commit(commit, &revs, &paths_of_changed_objects); + revs.diffopt.no_free = 0; handle_tags_and_duplicates(&extra_refs); handle_tags_and_duplicates(&tag_refs);