@@ -160,6 +160,11 @@ struct module_list {
};
#define MODULE_LIST_INIT { 0 }
+static void module_list_release(struct module_list *ml)
+{
+ free(ml->entries);
+}
+
static int module_list_compute(int argc, const char **argv,
const char *prefix,
struct pathspec *pathspec,
@@ -222,7 +227,7 @@ static void module_list_active(struct module_list *list)
active_modules.entries[active_modules.nr++] = ce;
}
- free(list->entries);
+ module_list_release(list);
*list = active_modules;
}
@@ -395,6 +400,7 @@ static int module_foreach(int argc, const char **argv, const char *prefix)
ret = 0;
cleanup:
+ module_list_release(&list);
clear_pathspec(&pathspec);
return ret;
}
@@ -540,6 +546,7 @@ static int module_init(int argc, const char **argv, const char *prefix)
ret = 0;
cleanup:
+ module_list_release(&list);
clear_pathspec(&pathspec);
return ret;
}
@@ -717,6 +724,7 @@ static int module_status(int argc, const char **argv, const char *prefix)
ret = 0;
cleanup:
+ module_list_release(&list);
clear_pathspec(&pathspec);
return ret;
}
@@ -1289,6 +1297,7 @@ static int module_sync(int argc, const char **argv, const char *prefix)
ret = 0;
cleanup:
+ module_list_release(&list);
clear_pathspec(&pathspec);
return ret;
}
@@ -1441,6 +1450,7 @@ static int module_deinit(int argc, const char **argv, const char *prefix)
ret = 0;
cleanup:
+ module_list_release(&list);
clear_pathspec(&pathspec);
return ret;
}
@@ -1810,6 +1820,12 @@ struct submodule_update_clone {
};
#define SUBMODULE_UPDATE_CLONE_INIT { 0 }
+static void submodule_update_clone_release(struct submodule_update_clone *suc)
+{
+ free(suc->update_clone);
+ free(suc->failed_clones);
+}
+
struct update_data {
const char *prefix;
const char *displaypath;
@@ -1848,6 +1864,11 @@ struct update_data {
.max_jobs = 1, \
}
+static void update_data_release(struct update_data *ud)
+{
+ module_list_release(&ud->list);
+}
+
static void next_submodule_warn_missing(struct submodule_update_clone *suc,
struct strbuf *out, const char *displaypath)
{
@@ -2530,6 +2551,7 @@ static int update_submodules(struct update_data *update_data)
}
cleanup:
+ submodule_update_clone_release(&suc);
string_list_clear(&update_data->references, 0);
return res;
}
@@ -2627,6 +2649,7 @@ static int module_update(int argc, const char **argv, const char *prefix)
if (module_list_compute(argc, argv, opt.prefix,
&pathspec2, &list) < 0) {
+ module_list_release(&list);
ret = 1;
goto cleanup;
}
@@ -2643,10 +2666,12 @@ static int module_update(int argc, const char **argv, const char *prefix)
info.flags |= OPT_QUIET;
for_each_listed_submodule(&list, init_submodule_cb, &info);
+ module_list_release(&list);
}
ret = update_submodules(&opt);
cleanup:
+ update_data_release(&opt);
list_objects_filter_release(&filter_options);
clear_pathspec(&pathspec);
clear_pathspec(&pathspec2);
@@ -2762,6 +2787,7 @@ static int absorb_git_dirs(int argc, const char **argv, const char *prefix)
ret = 0;
cleanup:
clear_pathspec(&pathspec);
+ module_list_release(&list);
return ret;
}
@@ -2,6 +2,7 @@
test_description='test case exclude pathspec'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup a submodule' '
Add release functions for "struct module_list", "struct submodule_update_clone" and "struct update_data". Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/submodule--helper.c | 28 +++++++++++++++++++++++++++- t/t6134-pathspec-in-submodule.sh | 1 + 2 files changed, 28 insertions(+), 1 deletion(-)