summaryrefslogtreecommitdiff
path: root/credential.c
diff options
context:
space:
mode:
Diffstat (limited to 'credential.c')
-rw-r--r--credential.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/credential.c b/credential.c
index 108d9e183a..064e25e5d5 100644
--- a/credential.c
+++ b/credential.c
@@ -399,7 +399,14 @@ int credential_from_url_gently(struct credential *c, const char *url,
cp = proto_end + 3;
at = strchr(cp, '@');
colon = strchr(cp, ':');
- slash = strchrnul(cp, '/');
+
+ /*
+ * A query or fragment marker before the slash ends the host portion.
+ * We'll just continue to call this "slash" for simplicity. Notably our
+ * "trim leading slashes" part won't skip over this part of the path,
+ * but that's what we'd want.
+ */
+ slash = cp + strcspn(cp, "/?#");
if (!at || slash <= at) {
/* Case (1) */