Merge "Fix vold's use of readdir_r(3)."
This commit is contained in:
commit
edf4e17940
2 changed files with 2 additions and 2 deletions
|
@ -270,7 +270,7 @@ void CommandListener::AsecCmd::listAsecsInDirectory(SocketClient *cli, const cha
|
|||
}
|
||||
|
||||
size_t dirent_len = offsetof(struct dirent, d_name) +
|
||||
pathconf(directory, _PC_NAME_MAX) + 1;
|
||||
fpathconf(dirfd(d), _PC_NAME_MAX) + 1;
|
||||
|
||||
struct dirent *dent = (struct dirent *) malloc(dirent_len);
|
||||
if (dent == NULL) {
|
||||
|
|
|
@ -1471,7 +1471,7 @@ int VolumeManager::unmountAllAsecsInDir(const char *directory) {
|
|||
}
|
||||
|
||||
size_t dirent_len = offsetof(struct dirent, d_name) +
|
||||
pathconf(directory, _PC_NAME_MAX) + 1;
|
||||
fpathconf(dirfd(d), _PC_NAME_MAX) + 1;
|
||||
|
||||
struct dirent *dent = (struct dirent *) malloc(dirent_len);
|
||||
if (dent == NULL) {
|
||||
|
|
Loading…
Reference in a new issue