Fixed segfault in fast-import after growing a tree.
Growing a tree caused all subtrees to be deallocated and put back into the free list yet those subtree's contents were still actively in use. Consequently they were doled out again and got stomped on elsewhere. Releasing a tree is now performed in two parts, either releasing only the content array or releasing the content array and recursively releasing the subtree(s). Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce committed
Aug 23, 2006 at 01:33 UTC
afde8dd96dbb81688d7cb22330e4fffcfc7def21
1 file changed
+10
-5
fast-import.c
+10
-5
@@ -420,11 +420,16 @@ static void release_tree_content(struct tree_content *t)
420
{
421
struct avail_tree_content *f = (struct avail_tree_content*)t;
422
unsigned int hc = hc_entries(f->entry_capacity);
423
+ f->next_avail = avail_tree_table[hc];
424
+ avail_tree_table[hc] = f;
425
+}
426
+
427
+static void release_tree_content_recursive(struct tree_content *t)
428
+{
429
unsigned int i;
430
for (i = 0; i < t->entry_count; i++)
431
release_tree_entry(t->entries[i]);
426
- f->next_avail = avail_tree_table[hc];
427
- avail_tree_table[hc] = f;
432
+ release_tree_content(t);
433
}
434
435
static struct tree_content* grow_tree_content(
@@ -459,7 +464,7 @@ static struct tree_entry* new_tree_entry()
464
static void release_tree_entry(struct tree_entry *e)
465
{
466
if (e->tree)
462
- release_tree_content(e->tree);
467
+ release_tree_content_recursive(e->tree);
468
*((void**)e) = avail_tree_entry;
469
avail_tree_entry = e;
470
}
@@ -720,7 +725,7 @@ static int tree_content_set(
725
e->mode = mode;
726
memcpy(e->sha1, sha1, 20);
727
if (e->tree) {
723
- release_tree_content(e->tree);
728
+ release_tree_content_recursive(e->tree);
729
e->tree = NULL;
730
}
731
memcpy(root->sha1, null_sha1, 20);
@@ -986,7 +991,7 @@ static void unload_one_branch()
991
}
992
e->active_next_branch = NULL;
993
if (e->branch_tree.tree) {
989
- release_tree_content(e->branch_tree.tree);
994
+ release_tree_content_recursive(e->branch_tree.tree);
995
e->branch_tree.tree = NULL;
996
}
997
cur_active_branches--;