From: "Ville Skyttä" <ville.skytta@iki.fi>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] completion: fix prompt with unset SHOWCONFLICTSTATE in nounset mode
Date: Mon, 1 Apr 2024 19:10:30 +0000 [thread overview]
Message-ID: <CABr9L5CLNCYFcta0aMApkyxr_jW9wycY8GmJsUPr9kg1smv+Kg@mail.gmail.com> (raw)
In-Reply-To: <xmqqh6gl9eq5.fsf@gitster.g>
On Mon, 1 Apr 2024 at 17:26, Junio C Hamano <gitster@pobox.com> wrote:
>
> Ville Skyttä <ville.skytta@iki.fi> writes:
>
> > I initially actually changed those very lines too when working on the
> > fix for the issue I faced with GIT_PS1_SHOWCONFLICTSTATE. However,
> > both occurrences are within __git_ps1_show_upstream, and the only call
> > site for that function is protected by a check on the variable that
> > does take possible unset state into account; the function will in the
> > file's current form never be called with it unset. Additionally, the
> > first occurrence is immediately following a line that sets the
> > variable, so that one is "doubly protected".
> >
> > Therefore, I decided to undo those changes and not include them here.
> > I guess it's a matter of taste whether one finds it desirable to
> > protect those accesses nevertheless, but it's not strictly necessary.
>
> I am glad you took a look into it already. I wonder if we can
> somehow keep this "institutional knowledge" to help the next person
> by saving them from wasting time wondering about the reason why it
> is safe (iow, what you have found out and described above). Perhaps
> a patch like this? I dunno.
TBH, I'd personally just rather patch the "vulnerable" reference to
guard against this. Sent that approach in another mail with subject
"[PATCH] completion: protect prompt against unset SHOWUPSTREAM in
nounset mode".
next prev parent reply other threads:[~2024-04-01 19:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-01 11:30 [PATCH] completion: fix prompt with unset SHOWCONFLICTSTATE in nounset mode Ville Skyttä
2024-04-01 15:31 ` Junio C Hamano
2024-04-01 17:07 ` Ville Skyttä
2024-04-01 17:26 ` Junio C Hamano
2024-04-01 19:10 ` Ville Skyttä [this message]
2024-04-01 19:38 ` 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=CABr9L5CLNCYFcta0aMApkyxr_jW9wycY8GmJsUPr9kg1smv+Kg@mail.gmail.com \
--to=ville.skytta@iki.fi \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).