Junio C Hamano  committed 5b5fe9a Merge

Merge branch 'maint' of git:// into maint

* 'maint' of git://
Don't allow empty pathnames in fast-import
import-tars: be nice to wrong directory modes

  • Participants
  • Parent commits cb2cada, ec771a7

Comments (0)

Files changed (2)

File contrib/fast-import/import-tars.perl

 			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;

File fast-import.c

 		n = slash1 - p;
 		n = strlen(p);
+	if (!n)
+		die("Empty path component found in input");
 	for (i = 0; i < t->entry_count; i++) {
 		e = t->entries[i];