Skip to content

Commit

Permalink
dir: revert work-around for retired dangerous behavior
Browse files Browse the repository at this point in the history
directory_exists_in_index_icase() dangerously assumed that it could
access one character beyond the end of its directory argument, and that
that character would unconditionally be '/'.  2eac2a4 (ls-files -k: a
directory only can be killed if the index has a non-directory,
2013-08-15) added a caller which did not respect this undocumented
assumption, and 680be04 (dir.c::test_one_path(): work around
directory_exists_in_index_icase() breakage, 2013-08-23) added a
work-around which temporarily appends a '/' before invoking
directory_exists_in_index_icase().

Since the dangerous behavior of directory_exists_in_index_icase() has
been eliminated, the work-around is now redundant, so retire it (but not
the tests added by the same commit).

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Eric Sunshine authored and Junio C Hamano committed Sep 17, 2013
1 parent d28eec2 commit de372b1
Showing 1 changed file with 3 additions and 15 deletions.
18 changes: 3 additions & 15 deletions dir.c
Original file line number Diff line number Diff line change
Expand Up @@ -1160,21 +1160,9 @@ static enum path_treatment treat_one_path(struct dir_struct *dir,
*/
if ((dir->flags & DIR_COLLECT_KILLED_ONLY) &&
(dtype == DT_DIR) &&
!has_path_in_index) {
/*
* NEEDSWORK: directory_exists_in_index_icase()
* assumes that one byte past the given path is
* readable and has '/', which needs to be fixed, but
* until then, work it around in the caller.
*/
strbuf_addch(path, '/');
if (directory_exists_in_index(path->buf, path->len - 1) ==
index_nonexistent) {
strbuf_setlen(path, path->len - 1);
return path_none;
}
strbuf_setlen(path, path->len - 1);
}
!has_path_in_index &&
(directory_exists_in_index(path->buf, path->len) == index_nonexistent))
return path_none;

exclude = is_excluded(dir, path->buf, &dtype);

Expand Down

0 comments on commit de372b1

Please sign in to comment.