X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fdirent%2Fscandir.c;h=a85cfac115b7dcf034b37c9cdc3531105b278c17;hp=aad813ac792b574b02d32b8d2b50eb2fd391d483;hb=da88b16a221c9d327e1bfa61dd6f4f08dacce57a;hpb=dae17a1aaf25d8333e729173d86659066607d87d diff --git a/src/dirent/scandir.c b/src/dirent/scandir.c index aad813ac..a85cfac1 100644 --- a/src/dirent/scandir.c +++ b/src/dirent/scandir.c @@ -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);