From patchwork Fri Mar 22 00:03:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thalia Archibald X-Patchwork-Id: 13599478 Received: from mail-4317.proton.ch (mail-4317.proton.ch [185.70.43.17]) (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 468D638D for ; Fri, 22 Mar 2024 00:03:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.70.43.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711065829; cv=none; b=TBg5zLPgi30c9mDq4nr6/JtOKP18soZ82PbEQmvhPWi8S/d7KEBkZyPJMkm9q6QklNBR2RNNvKW6fLuGuZ/6DY0dZgrQ8nCHe8NSvoGfURuKxmQUDQP/NS5QEfpPl9PkgCv3PWBeMDQtc49R8aPNWlkXojIvqHTEEVUULDMWqyE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711065829; c=relaxed/simple; bh=P7xUPbFPcsR4OH3Ix+vLPng3avVXijxaKs1jZjU06SM=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WHgisSfFH/9abtJBzuau9vWMeEwJLhfLk07lcL3S6kqWJq/6WuIA8B/456pb79PqTiHfdXP2/QvQXYU4Yo45l1dHU23rrEki/3qe/n0GE91EzvXSde8pmZDgblwtvCWCt3GaStdOwEIfyRmUDoHwU6MwuCg055T01tNrrRrT9gs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=archibald.dev; spf=pass smtp.mailfrom=archibald.dev; dkim=pass (2048-bit key) header.d=archibald.dev header.i=@archibald.dev header.b=uaOiD8qB; arc=none smtp.client-ip=185.70.43.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=archibald.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=archibald.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=archibald.dev header.i=@archibald.dev header.b="uaOiD8qB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=archibald.dev; s=protonmail3; t=1711065825; x=1711325025; bh=P7xUPbFPcsR4OH3Ix+vLPng3avVXijxaKs1jZjU06SM=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=uaOiD8qB10zD0+g1MYhBC7VoW6OdyytkedW9c7K1bic1ImLNCxzGV1vPWDMMUJQZi ytCH1mVQjZBBi/993yWJ0wZOgVB/2sojZ2XLQaWYraePKgaeoU5CXpv3o8BgA7gLrQ fVXNKrttSrDWCiRDjwWVPjGjtS4YUUr9Pzk3WXbnjeAtl6uulRLukRQoyuZ8jWbjiF UH7UYMmSMKaO8d16o8+DZcqij3djILo8H5XhQHoWTBo7mWTMCPd+HeLuuJpirDPfBh 4u7A2U6+X/5pzNAr7ZUx5PhfdYBIKEyOqw+mgdzZgKfVKF5gP2mDxOxbOWZSdZwx4X tnNNRGJRT6pTA== Date: Fri, 22 Mar 2024 00:03:33 +0000 To: git@vger.kernel.org From: Thalia Archibald Cc: Elijah Newren , Thalia Archibald Subject: [PATCH 3/6] fast-import: release unfreed strbufs Message-ID: <20240322000304.76810-4-thalia@archibald.dev> In-Reply-To: <20240322000304.76810-1-thalia@archibald.dev> References: <20240322000304.76810-1-thalia@archibald.dev> Feedback-ID: 63908566:user:proton Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 These strbufs are owned. Release them at the end of their scopes. Signed-off-by: Thalia Archibald --- builtin/fast-import.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/builtin/fast-import.c b/builtin/fast-import.c index 1b3d6784c1..d6f998f363 100644 --- a/builtin/fast-import.c +++ b/builtin/fast-import.c @@ -2364,6 +2364,7 @@ static void file_change_m(const char *p, struct branch *b) /* Git does not track empty, non-toplevel directories. */ if (S_ISDIR(mode) && is_empty_tree_oid(&oid) && *path.buf) { tree_content_remove(&b->branch_tree, path.buf, NULL, 0); + strbuf_release(&path); return; } @@ -2409,11 +2410,11 @@ static void file_change_m(const char *p, struct branch *b) command_buf.buf); } - if (!*path.buf) { + if (*path.buf) + tree_content_set(&b->branch_tree, path.buf, &oid, mode, NULL); + else tree_content_replace(&b->branch_tree, &oid, mode, NULL); - return; - } - tree_content_set(&b->branch_tree, path.buf, &oid, mode, NULL); + strbuf_release(&path); } static void file_change_d(const char *p, struct branch *b) @@ -2422,6 +2423,7 @@ static void file_change_d(const char *p, struct branch *b) parse_path_eol(&path, p, "path"); tree_content_remove(&b->branch_tree, path.buf, NULL, 1); + strbuf_release(&path); } static void file_change_cr(const char *p, struct branch *b, int rename) @@ -2440,17 +2442,18 @@ static void file_change_cr(const char *p, struct branch *b, int rename) tree_content_get(&b->branch_tree, source.buf, &leaf, 1); if (!leaf.versions[1].mode) die("Path %s not in branch", source.buf); - if (!*dest.buf) { /* C "path/to/subdir" "" */ + if (*dest.buf) + tree_content_set(&b->branch_tree, dest.buf, + &leaf.versions[1].oid, + leaf.versions[1].mode, + leaf.tree); + else /* C "path/to/subdir" "" */ tree_content_replace(&b->branch_tree, &leaf.versions[1].oid, leaf.versions[1].mode, leaf.tree); - return; - } - tree_content_set(&b->branch_tree, dest.buf, - &leaf.versions[1].oid, - leaf.versions[1].mode, - leaf.tree); + strbuf_release(&source); + strbuf_release(&dest); } static void note_change_n(const char *p, struct branch *b, unsigned char *old_fanout) @@ -2804,6 +2807,7 @@ static void parse_new_commit(const char *arg) free(author); free(committer); free(encoding); + strbuf_release(&msg); if (!store_object(OBJ_COMMIT, &new_data, NULL, &b->oid, next_mark)) b->pack_id = pack_id; @@ -2886,6 +2890,7 @@ static void parse_new_tag(const char *arg) strbuf_addch(&new_data, '\n'); strbuf_addbuf(&new_data, &msg); free(tagger); + strbuf_release(&msg); if (store_object(OBJ_TAG, &new_data, NULL, &t->oid, next_mark)) t->pack_id = MAX_PACK_ID; @@ -3171,6 +3176,7 @@ static void print_ls(int mode, const unsigned char *hash, const char *path) strbuf_addch(&line, '\n'); } cat_blob_write(line.buf, line.len); + strbuf_release(&line); } static void parse_ls(const char *p, struct branch *b) @@ -3206,6 +3212,7 @@ static void parse_ls(const char *p, struct branch *b) release_tree_content_recursive(leaf.tree); if (!b || root != &b->branch_tree) release_tree_entry(root); + strbuf_release(&path); } static void checkpoint(void)