diff options
Diffstat (limited to 'indra/llfilesystem/lldir.cpp')
| -rw-r--r-- | indra/llfilesystem/lldir.cpp | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/indra/llfilesystem/lldir.cpp b/indra/llfilesystem/lldir.cpp index 756d09e69a..37c6f61a05 100644 --- a/indra/llfilesystem/lldir.cpp +++ b/indra/llfilesystem/lldir.cpp @@ -98,15 +98,29 @@ std::vector<std::string> LLDir::getFilesInDir(const std::string &dirname) if (std::filesystem::is_directory(dir_path, ec)) { std::filesystem::directory_iterator end_iter; - for (std::filesystem::directory_iterator dir_itr(dir_path); - dir_itr != end_iter; - ++dir_itr) + try { - if (std::filesystem::is_regular_file(dir_itr->status())) + for (std::filesystem::directory_iterator dir_itr(dir_path); + dir_itr != end_iter; + ++dir_itr) { - v.push_back(dir_itr->path().filename().string()); + try + { + if (std::filesystem::is_regular_file(dir_itr->status())) + { + v.push_back(fsyspath(dir_itr->path().filename()).string()); + } + } + catch (const std::system_error& e) + { + LL_WARNS() << "Exception accessing directory entry: " << e.what() << LL_ENDL; + } } } + catch (const std::system_error& e) + { + LL_WARNS() << "Exception iterating directory: " << e.what() << LL_ENDL; + } } return v; } |