| Message ID | f7a8de14fe255286e62fc46d0a3083189f46bcc6.1684944140.git.me@ttaylorr.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | builtin/submodule--helper.c: handle missing submodule URLs | expand |
On Wed, May 24, 2023 at 12:02:26PM -0400, Taylor Blau wrote: > 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
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 @@ -2069,7 +2069,6 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, strvec_push(&child->args, "--require-init"); strvec_pushl(&child->args, "--path", sub->path, NULL); strvec_pushl(&child->args, "--name", sub->name, NULL); - strvec_pushl(&child->args, "--url", url, NULL); if (suc->update_data->references.nr) { struct string_list_item *item; @@ -2082,6 +2081,12 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, strvec_push(&child->args, suc->update_data->single_branch ? "--single-branch" : "--no-single-branch"); + /* + * `url` might be NULL, so ensure that this argument is passed + * last to avoid confusing the next argument as the value for + * `--url`. + */ + strvec_pushl(&child->args, "--url", url, NULL); cleanup: free(displaypath); diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index eae6a46ef3..c97c543dd8 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -1351,6 +1351,22 @@ test_expect_success 'clone active submodule without submodule url set' ' ) ' +test_expect_success 'update submodules without url set in .gitconfig' ' + test_when_finished "rm -rf multisuper_clone" && + git clone file://"$pwd"/multisuper multisuper_clone && + + git -C multisuper_clone submodule init && + for s in sub0 sub1 sub2 sub3 + do + key=submodule.$s.url && + git -C multisuper_clone config --local --unset $key && + git -C multisuper_clone config --file .gitmodules --unset $key || return 1 + done && + + test_must_fail git -C multisuper_clone submodule update 2>err && + grep "option .url. requires a value" err +' + test_expect_success 'clone --recurse-submodules with a pathspec works' ' test_when_finished "rm -rf multisuper_clone" && cat >expected <<-\EOF &&
In e0a862fdaf (submodule helper: convert relative URL to absolute URL if needed, 2018-10-16), `prepare_to_clone_next_submodule()` lost the ability to handle URL-less submodules, due to a change from: if (repo_get_config_string_const(the_repostiory, sb.buf, &url)) url = sub->url; to if (repo_get_config_string_const(the_repostiory, sb.buf, &url)) { if (starts_with_dot_slash(sub->url) || starts_with_dot_dot_slash(sub->url)) { /* ... */ } } , which will segfault when `sub->url` is NULL, since both `starts_with_dot_slash()` does not guard its arguments as non-NULL. Guard the checks to both of the above functions by first whether `sub->url` is non-NULL. There is no need to check whether `sub` itself is NULL, since we already perform this check earlier in `prepare_to_clone_next_submodule()`. By adding a NULL-ness check on `sub->url`, we'll fall into the 'else' branch, setting `url` to `sub->url` (which is NULL). When we then try and invoke `git submodule-helper` below, we'll get the expected error message: error: option `url' requires a value Note that this means that `--url` and its value must come last when preparing the argument list, to avoid confusing the next argument as the value for `--url` if `url` itself is NULL. Reported-by: Tribo Dar <3bodar@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com> --- builtin/submodule--helper.c | 11 ++++++++--- t/t7400-submodule-basic.sh | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-)