undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dir: respect string length argument of read_directory_recursive()

Browse Source 
A directory name is passed to read_directory_recursive() as a
length-limited string, through the parameters base and baselen.
Suprisingly, base must be a NUL-terminated string as well, as it is
passed to opendir(), ignoring baselen.

Fix this by postponing the call to opendir() until the length-limted
string is added to a strbuf, which provides a NUL in the right place.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2012-05-11 16:53:07 +02:00 committed by Junio C Hamano
parent bef369219a
commit 1528d247e5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dir.c
View File

@ -960,16 +960,17 @@ static int read_directory_recursive(struct dir_struct *dir,
int check_only, int check_only,
const struct path_simplify *simplify) const struct path_simplify *simplify)
{ {
DIR *fdir = opendir(*base ? base : "."); DIR *fdir;
int contents = 0; int contents = 0;
struct dirent *de; struct dirent *de;
struct strbuf path = STRBUF_INIT; struct strbuf path = STRBUF_INIT;
if (!fdir)
return 0;
strbuf_add(&path, base, baselen); strbuf_add(&path, base, baselen);
fdir = opendir(path.len ? path.buf : ".");
if (!fdir)
goto out;
while ((de = readdir(fdir)) != NULL) { while ((de = readdir(fdir)) != NULL) {
switch (treat_path(dir, de, &path, baselen, simplify)) { switch (treat_path(dir, de, &path, baselen, simplify)) {
case path_recurse: case path_recurse:
@ -984,12 +985,11 @@ static int read_directory_recursive(struct dir_struct *dir,
} }
contents++; contents++;
if (check_only) if (check_only)
goto exit_early; break;
else dir_add_name(dir, path.buf, path.len);
dir_add_name(dir, path.buf, path.len);
} }
exit_early:
closedir(fdir); closedir(fdir);
out:
strbuf_release(&path); strbuf_release(&path);
return contents; return contents;