| Message ID | patch-v2-5.9-4fea2b77c6d-20230112T124201Z-avarab@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | sequencer API & users: fix widespread leaks | expand |
On 12/01/2023 12:45, Ævar Arnfjörð Bjarmason wrote: > The real use of the "squash_onto_name" added in [1] is to keep track > of a value for later free()-ing, we don't subsequently use it for > anything else. > > Let's rename it in preparation for re-using it for free()-ing before > another assignment to "options.onto_name", which is an outstanding > leak that'll be fixed in a subsequent commit. This is good Thanks Phillip > 1. 9dba809a69a (builtin rebase: support --root, 2018-09-04) > > Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> > --- > builtin/rebase.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/builtin/rebase.c b/builtin/rebase.c > index 5859a5387d8..0d8c050f6b3 100644 > --- a/builtin/rebase.c > +++ b/builtin/rebase.c > @@ -1036,7 +1036,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > const char *rebase_merges = NULL; > struct string_list strategy_options = STRING_LIST_INIT_NODUP; > struct object_id squash_onto; > - char *squash_onto_name = NULL; > + char *to_free = NULL; > int reschedule_failed_exec = -1; > int allow_preemptive_ff = 1; > int preserve_merges_selected = 0; > @@ -1589,7 +1589,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > &squash_onto, NULL, NULL) < 0) > die(_("Could not create new root commit")); > options.squash_onto = &squash_onto; > - options.onto_name = squash_onto_name = > + options.onto_name = to_free = > xstrdup(oid_to_hex(&squash_onto)); > } else > options.root_with_onto = 1; > @@ -1835,7 +1835,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > free(options.cmd); > free(options.strategy); > strbuf_release(&options.git_format_patch_opt); > - free(squash_onto_name); > + free(to_free); > string_list_clear(&exec, 0); > string_list_clear(&strategy_options, 0); > return !!ret;
diff --git a/builtin/rebase.c b/builtin/rebase.c index 5859a5387d8..0d8c050f6b3 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1036,7 +1036,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) const char *rebase_merges = NULL; struct string_list strategy_options = STRING_LIST_INIT_NODUP; struct object_id squash_onto; - char *squash_onto_name = NULL; + char *to_free = NULL; int reschedule_failed_exec = -1; int allow_preemptive_ff = 1; int preserve_merges_selected = 0; @@ -1589,7 +1589,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) &squash_onto, NULL, NULL) < 0) die(_("Could not create new root commit")); options.squash_onto = &squash_onto; - options.onto_name = squash_onto_name = + options.onto_name = to_free = xstrdup(oid_to_hex(&squash_onto)); } else options.root_with_onto = 1; @@ -1835,7 +1835,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) free(options.cmd); free(options.strategy); strbuf_release(&options.git_format_patch_opt); - free(squash_onto_name); + free(to_free); string_list_clear(&exec, 0); string_list_clear(&strategy_options, 0); return !!ret;
The real use of the "squash_onto_name" added in [1] is to keep track of a value for later free()-ing, we don't subsequently use it for anything else. Let's rename it in preparation for re-using it for free()-ing before another assignment to "options.onto_name", which is an outstanding leak that'll be fixed in a subsequent commit. 1. 9dba809a69a (builtin rebase: support --root, 2018-09-04) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/rebase.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)