From: "ZheNing Hu via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Christian Couder" <christian.couder@gmail.com>,
"Hariom Verma" <hariom18599@gmail.com>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"ZheNing Hu" <adlternative@gmail.com>,
"ZheNing Hu" <adlternative@gmail.com>
Subject: [PATCH 1/2] checkout: handling branch_info memory leak
Date: Fri, 10 Dec 2021 06:22:08 +0000 [thread overview]
Message-ID: <e9f6be692db40978b835e7298c1a1c664566ec84.1639117329.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1095.git.1639117329.gitgitgadget@gmail.com>
From: ZheNing Hu <adlternative@gmail.com>
On the checkout code path, we dynamically allocate
memory for `refname` and `path` in `struct branch_info`,
but did not free their memory at the end. So introduce
branch_info_clear() which can free branch_info memory.
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
---
builtin/checkout.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index cbf73b8c9f6..3eeac3147f2 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -103,6 +103,15 @@ struct branch_info {
char *checkout;
};
+static void branch_info_clear(struct branch_info *branch_info) {
+ if (branch_info->path) {
+ free((char *)branch_info->path);
+ branch_info->path = NULL;
+ }
+ if (branch_info->refname)
+ FREE_AND_NULL(branch_info->refname);
+}
+
static int post_checkout_hook(struct commit *old_commit, struct commit *new_commit,
int changed)
{
@@ -1578,6 +1587,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
{
struct branch_info new_branch_info;
int parseopt_flags = 0;
+ int ret = 0;
memset(&new_branch_info, 0, sizeof(new_branch_info));
opts->overwrite_ignore = 1;
@@ -1768,9 +1778,11 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
UNLEAK(opts);
if (opts->patch_mode || opts->pathspec.nr)
- return checkout_paths(opts, &new_branch_info);
+ ret = checkout_paths(opts, &new_branch_info);
else
- return checkout_branch(opts, &new_branch_info);
+ ret = checkout_branch(opts, &new_branch_info);
+ branch_info_clear(&new_branch_info);
+ return ret;
}
int cmd_checkout(int argc, const char **argv, const char *prefix)
--
gitgitgadget
next prev parent reply other threads:[~2021-12-10 6:22 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-10 6:22 [PATCH 0/2] checkout: introduce "--to-branch" option ZheNing Hu via GitGitGadget
2021-12-10 6:22 ` ZheNing Hu via GitGitGadget [this message]
2021-12-10 7:13 ` [PATCH 1/2] checkout: handling branch_info memory leak Ævar Arnfjörð Bjarmason
2021-12-10 6:22 ` [PATCH 2/2] checkout: introduce "--to-branch" option ZheNing Hu via GitGitGadget
2021-12-10 8:34 ` Christian Couder
2021-12-11 6:34 ` ZheNing Hu
2021-12-10 8:59 ` Ævar Arnfjörð Bjarmason
2021-12-11 7:11 ` ZheNing Hu
2021-12-10 11:51 ` Bagas Sanjaya
2021-12-11 7:12 ` ZheNing Hu
2021-12-10 22:14 ` Junio C Hamano
2021-12-11 7:51 ` ZheNing Hu
2021-12-12 18:46 ` Junio C Hamano
2021-12-13 19:55 ` Ævar Arnfjörð Bjarmason
2021-12-13 21:36 ` Junio C Hamano
2021-12-13 21:52 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e9f6be692db40978b835e7298c1a1c664566ec84.1639117329.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=adlternative@gmail.com \
--cc=avarab@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hariom18599@gmail.com \
--cc=pclouds@gmail.com \
--cc=sandals@crustytoothpaste.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).