[PATCH v2 2/2] fast-import: fix segfault in store_tree()
- From
- Maxim Bublis <satori@yandex-team.ru>
- Date
- Aug 29, 2014, 11:53 UTC
- Message-ID
- <1409313217-23198-3-git-send-email-satori@yandex-team.ru>
- In-Reply-To
- <1409313217-23198-1-git-send-email-satori@yandex-team.ru>
Branch tree is NULLified by filedelete command if we are trying to delete root tree. Add sanity check and use load_tree() in that case.
Signed-off-by: Maxim Bublis <satori@yandex-team.ru> --- fast-import.c | 6 +++++- t/t9300-fast-import.sh | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/fast-import.c b/fast-import.c index d73f58c..e380804 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1419,7 +1419,7 @@ static void mktree(struct tree_content *t, int v, struct strbuf *b) static void store_tree(struct tree_entry *root) { - struct tree_content *t = root->tree; + struct tree_content *t; unsigned int i, j, del; struct last_object lo = { STRBUF_INIT, 0, 0, /* no_swap */ 1 }; struct object_entry *le = NULL; @@ -1427,6 +1427,10 @@ static void store_tree(struct tree_entry *root) if (!is_null_sha1(root->versions[1].sha1)) return; + if (!root->tree) + load_tree(root); + t = root->tree; + for (i = 0; i < t->entry_count; i++) { if (t->entries[i]->tree) store_tree(t->entries[i]); diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 9cf5e45..d400442 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -3107,7 +3107,7 @@ D "" INPUT_END -test_expect_failure 'U: filedelete root succeeds' ' +test_expect_success 'U: filedelete root succeeds' ' git fast-import <input ' @@ -3117,7 +3117,7 @@ EOF git diff-tree -M -r U^1 U >actual -test_expect_failure 'U: validate root delete result' ' +test_expect_success 'U: validate root delete result' ' compare_diff_raw expect actual '
-- 1.8.5.2 (Apple Git-48)