[PATCH v3 1/3] remote: add relative_url_gently()
- From
- Aniket Gupta <aniketgupta3001@gmail.com>
- Date
- Nov 5, 2026, 15:28 UTC
- Message-ID
- <20261105152842.566318-2-aniketgupta3001@gmail.com>
- In-Reply-To
- <20261105152842.566318-1-aniketgupta3001@gmail.com>
relative_url() calls die() when there are more "../" components in the URL than the base URL can absorb. A caller that would rather carry on has no way to do so.
Add relative_url_gently(), which returns NULL and adds the reason to a strbuf instead of dying. relative_url() is now a thin wrapper around it that continues to die, so existing callers behave the same.
Signed-off-by: Aniket Gupta <aniketgupta3001@gmail.com> --- remote.c | 34 ++++++++++++++++++++++++++++------ remote.h | 8 ++++++++ 2 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/remote.c b/remote.c index 49ee2ea318..899d805b76 100644 --- a/remote.c +++ b/remote.c @@ -3005,7 +3005,8 @@ void remote_state_clear(struct remote_state *remote_state) } /* - * Returns 1 if it was the last chop before ':'. + * Returns 1 if it was the last chop before ':', or -1 if there is + * nothing left to chop. */ static int chop_last_dir(char **remoteurl, int is_relative) { @@ -3022,16 +3023,15 @@ static int chop_last_dir(char **remoteurl, int is_relative) } if (is_relative || !strcmp(".", *remoteurl)) - die(_("cannot strip one component off url '%s'"), - *remoteurl); + return -1; free(*remoteurl); *remoteurl = xstrdup("."); return 0; } -char *relative_url(const char *remote_url, const char *url, - const char *up_path) +char *relative_url_gently(const char *remote_url, const char *url, + const char *up_path, struct strbuf *err) { int is_relative = 0; int colonsep = 0; @@ -3073,8 +3073,19 @@ char *relative_url(const char *remote_url, const char *url, */ while (*url) { if (starts_with_dot_dot_slash_native(url)) { + int chopped; + url += 3; - colonsep |= chop_last_dir(&remoteurl, is_relative); + chopped = chop_last_dir(&remoteurl, is_relative); + if (chopped < 0) { + strbuf_addf(err, + _("cannot strip one component off url '%s'"), + remoteurl); + free(remoteurl); + strbuf_release(&sb); + return NULL; + } + colonsep |= chopped; } else if (starts_with_dot_slash_native(url)) url += 2; else @@ -3102,6 +3113,17 @@ char *relative_url(const char *remote_url, const char *url, return strbuf_detach(&sb, NULL); } +char *relative_url(const char *remote_url, const char *url, + const char *up_path) +{ + struct strbuf err = STRBUF_INIT; + char *out = relative_url_gently(remote_url, url, up_path, &err); + + if (!out) + die("%s", err.buf); + return out; +} + int valid_remote_name(const char *name) { int result; diff --git a/remote.h b/remote.h index cca02033b9..940474fa71 100644 --- a/remote.h +++ b/remote.h @@ -478,6 +478,14 @@ void apply_push_cas(struct push_cas_option *, struct remote *, struct ref *); char *relative_url(const char *remote_url, const char *url, const char *up_path); +/* + * Like relative_url(), but if `url` cannot be resolved against + * `remote_url`, return NULL and add the reason to `err` instead of + * dying. `err` must not be NULL. + */ +char *relative_url_gently(const char *remote_url, const char *url, + const char *up_path, struct strbuf *err); + int valid_remote_name(const char *name); #endif
-- 2.43.0