Re: [PATCH] builtin/submodule--helper.c: handle missing submodule URLs
From: Jeff King <hidden>
Date: 2023-05-24 22:58:12
Subsystem:
the rest · Maintainer:
Linus Torvalds
On Wed, May 24, 2023 at 12:02:26PM -0400, Taylor Blau wrote:
quoted hunk ↗ jump to hunk
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 6bf8d666ce..a7b7ea374f 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c@@ -2024,8 +2024,8 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, strbuf_reset(&sb); strbuf_addf(&sb, "submodule.%s.url", sub->name); if (repo_config_get_string_tmp(the_repository, sb.buf, &url)) { - if (starts_with_dot_slash(sub->url) || - starts_with_dot_dot_slash(sub->url)) { + if (sub->url && (starts_with_dot_slash(sub->url) || + starts_with_dot_dot_slash(sub->url))) { url = resolve_relative_url(sub->url, NULL, 0); need_free_url = 1; } else
Oh, btw, this need_free_url made me look at the memory handling for the other side of the else. I think it is all good, but it would be a little simpler using an extra pointer instead of a boolean:
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 6a16208e8a..6b7849b828 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c@@ -1984,7 +1984,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, ud->super_prefix); struct strbuf sb = STRBUF_INIT; int needs_cloning = 0; - int need_free_url = 0; + char *to_free_url = NULL; if (ce_stage(ce)) { strbuf_addf(out, _("Skipping unmerged submodule %s"), displaypath);
@@ -2025,10 +2025,9 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, strbuf_addf(&sb, "submodule.%s.url", sub->name); if (repo_config_get_string_tmp(the_repository, sb.buf, &url)) { if (sub->url && (starts_with_dot_slash(sub->url) || - starts_with_dot_dot_slash(sub->url))) { - url = resolve_relative_url(sub->url, NULL, 0); - need_free_url = 1; - } else + starts_with_dot_dot_slash(sub->url))) + url = to_free_url = resolve_relative_url(sub->url, NULL, 0); + else url = sub->url; }
@@ -2089,8 +2088,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, cleanup: free(displaypath); strbuf_release(&sb); - if (need_free_url) - free((void*)url); + free(to_free_url); return needs_cloning; }
Probably at this point that is just churn, but I thought I'd throw it out there. -Peff