| Message ID | patch-v2-11.24-c25b55c9528-20220719T204458Z-avarab@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | submodule--helper: fix memory leaks | expand |
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes: > - const char *sm_path; > + char *sm_path; > }; > #define MODULE_CB_INIT { 0 } > +static void module_cb_release(struct module_cb *mcb) > +{ > + free(mcb->sm_path); > +} It would be nice to have a blank line before the new helper function, just like you did for the next hunk. > struct module_cb_list { > struct module_cb **entries; > @@ -838,6 +842,19 @@ struct module_cb_list { > }; > #define MODULE_CB_LIST_INIT { 0 } > > +static void module_cb_list_release(struct module_cb_list *mcbl) > +{ > + int i; > + > + for (i = 0; i < mcbl->nr; i++) { > + struct module_cb *mcb = mcbl->entries[i]; > + > + module_cb_release(mcb); > + free(mcb); > + } > + free(mcbl->entries); > +} OK, this was populated in the diff callback function and each element of the list->entries[] array is a module_cb data, which has its own release() helper above. Looking good. > struct summary_cb { > int argc; > const char **argv; > @@ -1181,6 +1198,7 @@ static int compute_summary_module_list(struct object_id *head_oid, > cleanup: > strvec_clear(&diff_args); > release_revisions(&rev); > + module_cb_list_release(&list); > return ret; > }
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index e51640d020c..a95231b1698 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -828,9 +828,13 @@ struct module_cb { struct object_id oid_src; struct object_id oid_dst; char status; - const char *sm_path; + char *sm_path; }; #define MODULE_CB_INIT { 0 } +static void module_cb_release(struct module_cb *mcb) +{ + free(mcb->sm_path); +} struct module_cb_list { struct module_cb **entries; @@ -838,6 +842,19 @@ struct module_cb_list { }; #define MODULE_CB_LIST_INIT { 0 } +static void module_cb_list_release(struct module_cb_list *mcbl) +{ + int i; + + for (i = 0; i < mcbl->nr; i++) { + struct module_cb *mcb = mcbl->entries[i]; + + module_cb_release(mcb); + free(mcb); + } + free(mcbl->entries); +} + struct summary_cb { int argc; const char **argv; @@ -1181,6 +1198,7 @@ static int compute_summary_module_list(struct object_id *head_oid, cleanup: strvec_clear(&diff_args); release_revisions(&rev); + module_cb_list_release(&list); return ret; }
Fix leaks in "struct module_cb_list" and the "struct module_cb" which it contains, these fixes leaks in e83e3333b57 (submodule: port submodule subcommand 'summary' from shell to C, 2020-08-13). The "sm_path" should always have been a "char *", not a "const char *", we always create it with xstrdup(). We can't mark any tests passing passing with SANITIZE=leak using "TEST_PASSES_SANITIZE_LEAK=true" as a result of this change, but "t7401-submodule-summary.sh" gets closer to passing as a result of this change. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/submodule--helper.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)