From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Patrick Steinhardt <ps@pks.im>, Taylor Blau <me@ttaylorr.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Karthik Nayak <karthik.188@gmail.com>,
Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>,
"brian m . carlson" <sandals@crustytoothpaste.net>,
"Randall S . Becker" <rsbecker@nexbridge.com>,
Christian Couder <christian.couder@gmail.com>,
Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH v6 3/4] promisor-remote: fix possible issue when no URL is advertised
Date: Tue, 18 Mar 2025 12:00:07 +0100 [thread overview]
Message-ID: <20250318110008.656695-4-christian.couder@gmail.com> (raw)
In-Reply-To: <20250318110008.656695-1-christian.couder@gmail.com>
In the 'KnownUrl' case, in should_accept_remote(), let's check that
`remote_url` is not NULL before we use strcmp() to compare it with
the local URL. This could avoid crashes if a server starts to not
advertise any URL in the future.
If `remote_url` is NULL, we should reject the URL. Let's also warn in
this case because we warn otherwise when a remote is rejected to try
to help diagnose things at the end of the function.
And while we are checking that remote_url is not NULL and warning if
it is, it makes sense to also help diagnose the case where remote_url
is empty.
Also while at it, let's spell "URL" with uppercase letters in all the
warnings.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
promisor-remote.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/promisor-remote.c b/promisor-remote.c
index ba80240f12..0b7b1ec45a 100644
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -409,10 +409,15 @@ static int should_accept_remote(enum accept_promisor accept,
if (accept != ACCEPT_KNOWN_URL)
BUG("Unhandled 'enum accept_promisor' value '%d'", accept);
+ if (!remote_url || !*remote_url) {
+ warning(_("no or empty URL advertised for remote '%s'"), remote_name);
+ return 0;
+ }
+
if (!strcmp(urls->v[i], remote_url))
return 1;
- warning(_("known remote named '%s' but with url '%s' instead of '%s'"),
+ warning(_("known remote named '%s' but with URL '%s' instead of '%s'"),
remote_name, urls->v[i], remote_url);
return 0;
--
2.49.0.1.g12e6251c65
next prev parent reply other threads:[~2025-03-18 11:00 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-10 7:40 [PATCH] promisor-remote: fix segfault when remote URL is missing Christian Couder
2025-03-10 16:29 ` Junio C Hamano
2025-03-11 15:24 ` Christian Couder
2025-03-11 16:57 ` Junio C Hamano
2025-03-11 15:24 ` [PATCH v2] " Christian Couder
2025-03-11 16:59 ` Junio C Hamano
2025-03-12 11:48 ` Christian Couder
2025-03-11 20:48 ` Junio C Hamano
2025-03-12 11:47 ` Christian Couder
2025-03-11 23:06 ` Jeff King
2025-03-11 23:36 ` Junio C Hamano
2025-03-12 11:47 ` Christian Couder
2025-03-12 11:46 ` [PATCH v3] " Christian Couder
2025-03-12 17:02 ` Junio C Hamano
2025-03-13 10:39 ` Christian Couder
2025-03-13 16:40 ` Junio C Hamano
2025-03-14 14:09 ` Christian Couder
2025-03-14 17:28 ` Junio C Hamano
2025-03-13 10:38 ` [PATCH v4] " Christian Couder
2025-03-13 16:28 ` Junio C Hamano
2025-03-13 17:23 ` Junio C Hamano
2025-03-14 14:10 ` Christian Couder
2025-03-14 14:12 ` [PATCH v5 0/3] "promisor-remote" capability fixes Christian Couder
2025-03-14 14:12 ` [PATCH v5 1/3] promisor-remote: fix segfault when remote URL is missing Christian Couder
2025-03-14 18:59 ` Junio C Hamano
2025-03-18 11:03 ` Christian Couder
2025-03-14 14:12 ` [PATCH v5 2/3] promisor-remote: fix possible issue when no URL is advertised Christian Couder
2025-03-14 14:12 ` [PATCH v5 3/3] promisor-remote: compare remote names case sensitively Christian Couder
2025-03-14 17:28 ` Junio C Hamano
2025-03-18 11:04 ` Christian Couder
2025-03-18 11:00 ` [PATCH v6 0/4] "promisor-remote" capability fixes Christian Couder
2025-03-18 11:00 ` [PATCH v6 1/4] t5710: arrange to delete the client before cloning Christian Couder
2025-03-18 11:00 ` [PATCH v6 2/4] promisor-remote: fix segfault when remote URL is missing Christian Couder
2025-03-18 11:00 ` Christian Couder [this message]
2025-03-18 11:00 ` [PATCH v6 4/4] promisor-remote: compare remote names case sensitively Christian Couder
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250318110008.656695-4-christian.couder@gmail.com \
--to=christian.couder@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=karthik.188@gmail.com \
--cc=kristofferhaugsbakk@fastmail.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=ps@pks.im \
--cc=rsbecker@nexbridge.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.
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 NNTP newsgroup(s).