summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Faye-Lund <kusmabite@gmail.com>2009-03-23 12:53:08 +0000
committerJunio C Hamano <gitster@pobox.com>2009-03-29 19:48:43 -0700
commitc0582c53bcf4e83bba70e1ad23abbad31f96ebc8 (patch)
treebd5a8222f3352aba250a1777a764ccffc194e330
parent2d07f6d4b728d19d115b89123224268718f34efd (diff)
downloadgit-c0582c53bcf4e83bba70e1ad23abbad31f96ebc8.tar.gz
builtin-fast-export.c: fix crash on tagged trees
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-fast-export.c4
-rwxr-xr-xt/t9301-fast-export.sh5
2 files changed, 6 insertions, 3 deletions
diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index 8a6cf5e649..1ec459f057 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 2e31f67465..b1f75ceea4 100755
--- a/t/t9301-fast-export.sh
+++ b/t/t9301-fast-export.sh
@@ -269,9 +269,8 @@ test_expect_success 'set-up a few more tags for tag export tests' '
'
# NEEDSWORK: not just check return status, but validate the output
-# two tests commented out due to crash and thus unreliable return code
-test_expect_failure 'tree_tag' 'git fast-export tree_tag'
-test_expect_failure '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'