summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2012-03-09 22:07:22 -0600
committerJonathan Nieder <jrnieder@gmail.com>2012-03-09 22:07:22 -0600
commit178e1deaae33f879ea687e85ac72455b3072b0d8 (patch)
tree649d84cda0fd2ee79be730bd3aa37764dc98c6ab /fast-import.c
parentc27e559da5b26faa31858fe6dc5492d4f605b867 (diff)
downloadgit-178e1deaae33f879ea687e85ac72455b3072b0d8.tar.gz
fast-import: don't allow 'ls' of path with empty componentsjn/maint-fast-import-empty-ls
As the fast-import manual explains: The value of <path> must be in canonical form. That is it must not: . contain an empty directory component (e.g. foo//bar is invalid), . end with a directory separator (e.g. foo/ is invalid), . start with a directory separator (e.g. /foo is invalid), Unfortunately the "ls" command accepts these invalid syntaxes and responds by declaring that the indicated path is missing. This is too subtle and causes importers to silently misbehave; better to error out so the operator knows what's happening. The C, R, and M commands already error out for such paths. Reported-by: Andrew Sayers <andrew-git@pileofstuff.org> Analysis-by: David Barr <davidbarr@google.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fast-import.c b/fast-import.c
index fff285cd0f..47f61f3cba 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1640,6 +1640,8 @@ static int tree_content_get(
n = slash1 - p;
else
n = strlen(p);
+ if (!n)
+ die("Empty path component found in input");
if (!root->tree)
load_tree(root);