Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint

* 'maint' of git://repo.or.cz/git/fastimport: Don't allow empty pathnames in fast-import import-tars: be nice to wrong directory modes
git-mirror · Apr 29, 2007 · 5b5fe9a · 5b5fe9a
2 parents cb2cada + ec771a7
commit 5b5fe9a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
@@ -52,6 +52,7 @@
 			Z8 Z1 Z100 Z6
 			Z2 Z32 Z32 Z8 Z8 Z*', $_;
 		last unless $name;
+		next if $name =~ '/$';
 		$mode = oct $mode;
 		$size = oct $size;
 		$mtime = oct $mtime;

diff --git a/fast-import.c b/fast-import.c
@@ -1193,6 +1193,8 @@ static int tree_content_set(
 		n = slash1 - p;
 	else
 		n = strlen(p);
+	if (!n)
+		die("Empty path component found in input");
 
 	for (i = 0; i < t->entry_count; i++) {
 		e = t->entries[i];