[PATCH 3/4] builtin-fast-export.c: fix crash on tagged trees
- From
Erik Faye-Lund <kusmabite@gmail.com>
- Date
- Mar 23, 2009, 12:53 UTC
- Message-ID
- <1237812789-1360-3-git-send-email-kusmabite@gmail.com>
- In-Reply-To
- <1237812789-1360-2-git-send-email-kusmabite@gmail.com>
If a tag object points to a tree (or another unhandled type), the commit- pointer is left uninitialized and later dereferenced. This patch adds a default case to the switch that issues a warning and skips the object.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> --- builtin-fast-export.c | 4 ++++ t/t9301-fast-export.sh | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/builtin-fast-export.c b/builtin-fast-export.c index 02bad1f..e716eee 100644 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -375,6 +375,10 @@ static void get_tags_and_duplicates(struct object_array *pending, case OBJ_BLOB: handle_object(tag->object.sha1); continue; + default: + warning("Tag points to object of unexpected type %s, skipping.", + typename(tag->object.type)); + continue; } break; default: diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh index db4b0b3..79ca832 100755 --- a/t/t9301-fast-export.sh +++ b/t/t9301-fast-export.sh @@ -265,9 +265,8 @@ test_expect_success 'cope with tagger-less tags' ' ' # NEEDSWORK: not just check return status, but validate the output -# two tests commented out due to crash and thus unreliable return code -#test_expect_success 'tree_tag' 'git fast-export tree_tag' -#test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj' +test_expect_success 'tree_tag' 'git fast-export tree_tag' +test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj' test_expect_failure 'tag-obj_tag' 'git fast-export tag-obj_tag' test_expect_failure 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
-- 1.6.2.1.225.g9a4a0.dirty