diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-05-05 14:36:24 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-05-05 14:36:24 -0700 |
commit | ee1268236798402d4d2660df634d6793b27f51d8 (patch) | |
tree | a5a33807a176d0cc2693a752bee07312ab4f1bbb | |
parent | 8e5c46e31571a1b1e88458dacc5d62e9c59eca6f (diff) | |
parent | 45a14f578e14ef5440d4bf971a9103795dac0c3a (diff) | |
download | git-ee1268236798402d4d2660df634d6793b27f51d8.tar.gz |
Merge branch 'rs/name-rev-fix-free-after-use' into maint
Regression fix for 2.36 where "git name-rev" started to sometimes
reference strings after they are freed.
This fixes a regression in 2.36 and is slate to go to 2.36.1
source: <340c8810-d912-7b18-d46e-a9d43f20216a@web.de>
* rs/name-rev-fix-free-after-use:
Revert "name-rev: release unused name strings"
-rw-r--r-- | builtin/name-rev.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/builtin/name-rev.c b/builtin/name-rev.c index c59b5699fe..02ea9d1633 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -18,7 +18,7 @@ #define CUTOFF_DATE_SLOP 86400 struct rev_name { - char *tip_name; + const char *tip_name; timestamp_t taggerdate; int generation; int distance; @@ -84,7 +84,7 @@ static int commit_is_before_cutoff(struct commit *commit) static int is_valid_rev_name(const struct rev_name *name) { - return name && (name->generation || name->tip_name); + return name && name->tip_name; } static struct rev_name *get_commit_rev_name(const struct commit *commit) @@ -146,20 +146,9 @@ static struct rev_name *create_or_update_name(struct commit *commit, { struct rev_name *name = commit_rev_name_at(&rev_names, commit); - if (is_valid_rev_name(name)) { - if (!is_better_name(name, taggerdate, generation, distance, from_tag)) - return NULL; - - /* - * This string might still be shared with ancestors - * (generation > 0). We can release it here regardless, - * because the new name that has just won will be better - * for them as well, so name_rev() will replace these - * stale pointers when it processes the parents. - */ - if (!name->generation) - free(name->tip_name); - } + if (is_valid_rev_name(name) && + !is_better_name(name, taggerdate, generation, distance, from_tag)) + return NULL; name->taggerdate = taggerdate; name->generation = generation; |