[PATCH/WIP 3/7] fast-import: fix a data corruption in parse_ls
- From
Dmitry Ivankov <divanorama@gmail.com>
- Date
- Jul 28, 2011, 04:46 UTC
- Message-ID
- <1311828370-30477-4-git-send-email-divanorama@gmail.com>
- In-Reply-To
- <1311828370-30477-1-git-send-email-divanorama@gmail.com>
store_tree sets versions[0] = versions[1] unconditionally. This is fine if it is run from the very root. But if it's run for a intermediate node in parse_ls, node's parent versions[0] can become invalid as it references it's children versions[0].
Move dropping old version to a function and don't drop old version in parse_ls. Also this split will allow to perform a few more fixes for store_tree itself.
Signed-off-by: Dmitry Ivankov <divanorama@gmail.com> --- fast-import.c | 42 ++++++++++++++++++++++++++---------------- 1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/fast-import.c b/fast-import.c index da9cb62..d5915b8 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1439,12 +1439,36 @@ static void mktree(struct tree_content *t, int v, struct strbuf *b) } } -static void store_tree(struct tree_entry *root) +static void drop_old(struct tree_entry *root) { struct tree_content *t = root->tree; unsigned int i, j, del; + + hashcpy(root->versions[0].sha1, root->versions[1].sha1); + root->versions[0].mode = root->versions[1].mode; + + if (!t) + return; + + for (i = 0, j = 0, del = 0; i < t->entry_count; i++) { + struct tree_entry *e = t->entries[i]; + if (e->versions[1].mode) { + drop_old(e); + t->entries[j++] = e; + } else { + release_tree_entry(e); + del++; + } + } + t->entry_count -= del; +} + +static void store_tree(struct tree_entry *root) +{ + struct tree_content *t = root->tree; struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 }; struct object_entry *le; + unsigned int i; if (!is_null_sha1(root->versions[1].sha1)) return; @@ -1464,20 +1488,7 @@ static void store_tree(struct tree_entry *root) mktree(t, 1, &new_tree); store_object(OBJ_TREE, &new_tree, &lo, root->versions[1].sha1, 0); - t->delta_depth = lo.depth; - for (i = 0, j = 0, del = 0; i < t->entry_count; i++) { - struct tree_entry *e = t->entries[i]; - if (e->versions[1].mode) { - e->versions[0].mode = e->versions[1].mode; - hashcpy(e->versions[0].sha1, e->versions[1].sha1); - t->entries[j++] = e; - } else { - release_tree_entry(e); - del++; - } - } - t->entry_count -= del; } static void tree_content_replace( @@ -2640,8 +2651,7 @@ static void parse_new_commit(void) /* build the tree and the commit */ store_tree(&b->branch_tree); - hashcpy(b->branch_tree.versions[0].sha1, - b->branch_tree.versions[1].sha1); + drop_old(&b->branch_tree); strbuf_reset(&new_data); strbuf_addf(&new_data, "tree %s\n",
-- 1.7.3.4