fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-04-25 15:22:15 +00:00
Code Issues Projects Releases Wiki Activity

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
parent 0dc99ac413
commit da88b16a22
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/dirent.h
View File

@ -18,7 +18,7 @@ struct dirent
off_t d_off; off_t d_off;
unsigned short d_reclen; unsigned short d_reclen;
unsigned char d_type; unsigned char d_type;
char d_name[1]; char d_name[256];
}; };
#define d_fileno d_ino #define d_fileno d_ino

7
src/dirent/scandir.c
View File

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

5
src/regex/glob.c
View File

@ -53,8 +53,7 @@ static int append(struct match **tail, const char *name, size_t len, int mark)
static int match_in_dir(const char *d, const char *p, int flags, int (*errfunc)(const char *path, int err), struct match **tail) static int match_in_dir(const char *d, const char *p, int flags, int (*errfunc)(const char *path, int err), struct match **tail)
{ {
DIR *dir; DIR *dir;
long long de_buf[(sizeof(struct dirent) + NAME_MAX + sizeof(long long))/sizeof(long long)]; struct dirent de_buf, *de;
struct dirent *de;
char pat[strlen(p)+1]; char pat[strlen(p)+1];
char *p2; char *p2;
size_t l = strlen(d); size_t l = strlen(d);
@ -94,7 +93,7 @@ static int match_in_dir(const char *d, const char *p, int flags, int (*errfunc)(
closedir(dir); closedir(dir);
return error; return error;
} }
while (!(error = readdir_r(dir, (void *)de_buf, &de)) && de) { while (!(error = readdir_r(dir, &de_buf, &de)) && de) {
char namebuf[l+de->d_reclen+2], *name = namebuf; char namebuf[l+de->d_reclen+2], *name = namebuf;
if (!literal && fnmatch(p, de->d_name, fnm_flags)) if (!literal && fnmatch(p, de->d_name, fnm_flags))
continue; continue;