From: Jeff King <peff@peff.net>
To: Glen Choo via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,
"Ing. Martin Prantl Ph.D." <perry@ntis.zcu.cz>,
Glen Choo <chooglen@google.com>
Subject: Re: [PATCH 1/2] remote.c: don't BUG() on 0-length branch names
Date: Wed, 8 Jun 2022 19:27:39 -0400 [thread overview]
Message-ID: <YqEwa37mNBqT7M+X@coredump.intra.peff.net> (raw)
In-Reply-To: <df6e4db6072e90afc92505a73792cf3c3221d5e4.1654038754.git.gitgitgadget@gmail.com>
On Tue, May 31, 2022 at 11:12:33PM +0000, Glen Choo via GitGitGadget wrote:
> Fix the bug by removing the convenience strlen functionality, so that
> 0 means that the string is 0-length. We still insert a bogus branch name
> into the hash map, but this will be fixed in a later commit.
I think this is a good change, regardless of whether we take the second
commit or not. These kind of "automagically run strlen() sometimes"
interfaces are subtle, and I think have bitten us before.
> diff --git a/remote.c b/remote.c
> index 42a4e7106e1..cf7015ae8ab 100644
> --- a/remote.c
> +++ b/remote.c
> @@ -195,9 +195,6 @@ static struct branch *find_branch(struct remote_state *remote_state,
> struct branches_hash_key lookup;
> struct hashmap_entry lookup_entry, *e;
>
> - if (!len)
> - len = strlen(name);
> -
> lookup.str = name;
> lookup.len = len;
> hashmap_entry_init(&lookup_entry, memhash(name, len));
This changes the behavior of find_branch() without changing its
signature. So any topics in flight that use it might be subtly broken. I
think that's probably OK in this instance, since it's a file-local
static, and was added relatively recently (i.e., the blast radius is
pretty small and unlikely).
-Peff
next prev parent reply other threads:[~2022-06-08 23:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-31 23:12 [PATCH 0/2] remote.c: reject 0-length branch names Glen Choo via GitGitGadget
2022-05-31 23:12 ` [PATCH 1/2] remote.c: don't BUG() on " Glen Choo via GitGitGadget
2022-06-08 23:27 ` Jeff King [this message]
2022-05-31 23:12 ` [PATCH 2/2] remote.c: reject " Glen Choo via GitGitGadget
2022-06-01 7:30 ` Ævar Arnfjörð Bjarmason
2022-06-01 16:55 ` Glen Choo
2022-06-01 21:21 ` Junio C Hamano
2022-06-08 23:24 ` Jeff King
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=YqEwa37mNBqT7M+X@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=chooglen@google.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=perry@ntis.zcu.cz \
/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).