jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix handling of d_name in struct dirent

Browse source 
basically there are 3 choices for how to implement this variable-size
string member:
1. C99 flexible array member: breaks using dirent.h with pre-C99 compiler.
2. old way: length-1 string: generates array bounds warnings in caller.
3. new way: length-NAME_MAX string. no problems, simplifies all code.

of course the usable part in the pointer returned by readdir might be
shorter than NAME_MAX+1 bytes, but that is allowed by the standard and
doesn't hurt anything.
This commit is contained in:
Rich Felker 2011-06-06 18:04:28 -04:00
commit da88b16a22
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/dirent/scandir.c
View file

@ -12,7 +12,7 @@ int scandir(const char *path, struct dirent ***res,
{
DIR *d = opendir(path);
struct dirent *de, **names=0, **tmp;
size_t cnt=0, len=0, size;
size_t cnt=0, len=0;
int old_errno = errno;
if (!d) return -1;
@ -26,10 +26,9 @@ int scandir(const char *path, struct dirent ***res,
if (!tmp) break;
names = tmp;
}
size = offsetof(struct dirent,d_name) + strlen(de->d_name) + 1;
names[cnt] = malloc(size);
names[cnt] = malloc(de->d_reclen);
if (!names[cnt]) break;
memcpy(names[cnt++], de, size);
memcpy(names[cnt++], de, de->d_reclen);
}
closedir(d);