mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 20:14:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

clean up name allocation in prepare_revision_walk

Browse Source 
When we enter prepare_revision_walk, we have zero or more
entries in our "pending" array. We disconnect that array
from the rev_info, and then process each entry:

  1. If the entry is a commit and the --source option is in
     effect, we keep a pointer to the object name.

  2. Otherwise, we re-add the item to the pending list with
     a blank name.

We then throw away the old array by freeing the array
itself, but do not touch the "name" field of each entry. For
any items of type (2), we leak the memory associated with
the name. This commit fixes that by calling object_array_clear,
which handles the cleanup for us.

That breaks (1), though, because it depends on the memory
pointed to by the name to last forever. We can solve that by
making a copy of the name. This is slightly less efficient,
but it shouldn't matter in practice, as we do it only for
the tip commits of the traversal.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2014-10-15 18:35:12 -04:00 committed by Junio C Hamano
parent 46be823124
commit 1da1e07c83
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
revision.c
View File

@ -300,7 +300,7 @@ static struct commit *handle_commit(struct rev_info *revs,
revs->limited = 1; revs->limited = 1;
} }
if (revs->show_source && !commit->util) if (revs->show_source && !commit->util)
commit->util = (void *) name; commit->util = xstrdup(name);
return commit; return commit;
} }
@ -2656,15 +2656,16 @@ void reset_revision_walk(void)
int prepare_revision_walk(struct rev_info *revs) int prepare_revision_walk(struct rev_info *revs)
{ {
int nr = revs->pending.nr; int i;
struct object_array_entry *e, *list; struct object_array old_pending;
struct commit_list **next = &revs->commits; struct commit_list **next = &revs->commits;
e = list = revs->pending.objects; memcpy(&old_pending, &revs->pending, sizeof(old_pending));
revs->pending.nr = 0; revs->pending.nr = 0;
revs->pending.alloc = 0; revs->pending.alloc = 0;
revs->pending.objects = NULL; revs->pending.objects = NULL;
while (--nr >= 0) { for (i = 0; i < old_pending.nr; i++) {
struct object_array_entry *e = old_pending.objects + i;
struct commit *commit = handle_commit(revs, e->item, e->name); struct commit *commit = handle_commit(revs, e->item, e->name);
if (commit) { if (commit) {
if (!(commit->object.flags & SEEN)) { if (!(commit->object.flags & SEEN)) {
@ -2672,10 +2673,9 @@ int prepare_revision_walk(struct rev_info *revs)
next = commit_list_append(commit, next); next = commit_list_append(commit, next);
} }
} }
e++;
} }
if (!revs->leak_pending) if (!revs->leak_pending)
free(list); object_array_clear(&old_pending);
/* Signal whether we need per-parent treesame decoration */ /* Signal whether we need per-parent treesame decoration */
if (revs->simplify_merges || if (revs->simplify_merges ||