mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-19 03:39:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make fs::dir::open skip forward on failed metadata instead of crashing

Browse Source
This commit is contained in:
Zeke Sonxx 2018-02-02 21:00:18 -05:00 committed by Ivan
parent f6b0b31e8b
commit c21fa2d8bc
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Utilities/File.cpp
View File

@ -1034,7 +1034,7 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
(fmt::throw_exception("Invalid whence (0x%x)" HERE, whence), 0); (fmt::throw_exception("Invalid whence (0x%x)" HERE, whence), 0);
const auto result = ::lseek(m_fd, offset, mode); const auto result = ::lseek(m_fd, offset, mode);
if (result == -1) if (result == -1)
{ {
g_tls_error = to_error(errno); g_tls_error = to_error(errno);
@ -1258,7 +1258,12 @@ bool fs::dir::open(const std::string& path)
} }
struct ::stat file_info; struct ::stat file_info;
verify("dir::read" HERE), ::fstatat(::dirfd(m_dd), found->d_name, &file_info, 0) == 0;
if (::fstatat(::dirfd(m_dd), found->d_name, &file_info, 0) != 0)
{
//failed metadata (broken symlink?), ignore and skip to next file
return read(info);
}
info.name = found->d_name; info.name = found->d_name;
info.is_directory = S_ISDIR(file_info.st_mode); info.is_directory = S_ISDIR(file_info.st_mode);
@ -1358,7 +1363,7 @@ std::string fs::get_data_dir(const std::string& prefix, const std::string& locat
continue; continue;
} }
buf.push_back(c); buf.push_back(c);
} }