From: Kevin Locke <kevin@kevinlocke.name>
To: Derrick Stolee <derrickstolee@github.com>
Cc: git@vger.kernel.org, Elijah Newren <newren@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v3] setup: don't die if realpath(3) fails on getcwd(3)
Date: Tue, 24 May 2022 12:00:43 -0600 [thread overview]
Message-ID: <Yo0dS550l2NCmx9O@kevinlocke.name> (raw)
In-Reply-To: <dafc8178-d213-ffd0-9e2a-32ac88307b39@github.com>
On Tue, 2022-05-24 at 13:41 -0400, Derrick Stolee wrote:
> On 5/24/2022 10:51 AM, Kevin Locke wrote:> - /* Normalize the directory */
>> - strbuf_realpath(&tmp, tmp_original_cwd, 1);
>> - free((char*)tmp_original_cwd);
>> - tmp_original_cwd = NULL;
>> - startup_info->original_cwd = strbuf_detach(&tmp, NULL);
>> + /* Try to normalize the directory. */
>> + if (strbuf_realpath(&tmp, tmp_original_cwd, 0)) {
>> + free((char*)tmp_original_cwd);
>> + tmp_original_cwd = NULL;
>> + startup_info->original_cwd = strbuf_detach(&tmp, NULL);
>> + } else {
>> + trace2_data_string("setup", the_repository,
>> + "realpath-path", tmp_original_cwd);
>> + trace2_data_string("setup", the_repository,
>> + "realpath-failure", strerror(errno));
>> + tmp_original_cwd = NULL;
>
> I didn't catch this in v2, but should this line instead be
>
> startup_info->original_cwd = NULL;
>
> ? Especially based on this comment:
No worries. It's a good question. Setting startup_info->original_cwd
to NULL is handled by the no_prevention_needed label. But I just
realized it's not actually required in this case, since original_cwd
is NULL when setup_original_cwd() is called. I should probably return
rather than jumping to no_prevention_needed from the else block to
avoid the unnecessary free(NULL) and assignment.
Your comment made me realize that v2 and later neglect to free
tmp_original_cwd when strbuf_realpath() fails. How embarrassing.
I'll send an update to fix both those issues shortly.
Thanks again,
Kevin
next prev parent reply other threads:[~2022-05-24 18:00 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-19 23:39 [PATCH] setup: don't die if realpath(3) fails on getcwd(3) Kevin Locke
2022-05-20 18:38 ` Junio C Hamano
2022-05-21 0:14 ` Elijah Newren
2022-05-21 13:02 ` Kevin Locke
2022-05-23 18:44 ` Derrick Stolee
2022-05-21 13:53 ` [PATCH v2] " Kevin Locke
2022-05-23 18:57 ` Derrick Stolee
2022-05-24 14:02 ` Kevin Locke
2022-05-24 15:20 ` Elijah Newren
2022-05-24 17:38 ` Derrick Stolee
2022-05-25 3:47 ` Elijah Newren
2022-05-27 7:48 ` Ævar Arnfjörð Bjarmason
2022-05-28 1:27 ` Elijah Newren
2022-05-24 14:51 ` [PATCH v3] " Kevin Locke
2022-05-24 15:21 ` Elijah Newren
2022-05-24 17:41 ` Derrick Stolee
2022-05-24 18:00 ` Kevin Locke [this message]
2022-05-24 19:20 ` [PATCH v4] " Kevin Locke
2022-05-24 20:40 ` Derrick Stolee
2022-05-24 21:25 ` Junio C Hamano
2022-05-25 3:51 ` Elijah Newren
2022-05-25 5:11 ` 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=Yo0dS550l2NCmx9O@kevinlocke.name \
--to=kevin@kevinlocke.name \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.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).