lvella/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

registered_cache: Prevent nullptr dereference when accumulating files

Browse source 
For whatever reason, nca_file/dir can be nullptr in the list of files/dirs. I have not determined the cause of this yet, so add a nullptr check for these prior to dereferencing them.
This commit is contained in:
Morph 2022-03-27 17:06:27 -04:00
parent 7382e7a5c8
commit ea7a0d4652
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/file_sys/registered_cache.cpp
View file

@ -387,15 +387,17 @@ std::vector<NcaID> RegisteredCache::AccumulateFiles() const {
continue; continue;
for (const auto& nca_dir : d2_dir->GetSubdirectories()) { for (const auto& nca_dir : d2_dir->GetSubdirectories()) {
if (!FollowsNcaIdFormat(nca_dir->GetName())) if (nca_dir == nullptr || !FollowsNcaIdFormat(nca_dir->GetName())) {
continue; continue;
}
ids.push_back(Common::HexStringToArray<0x10, true>(nca_dir->GetName().substr(0, 0x20))); ids.push_back(Common::HexStringToArray<0x10, true>(nca_dir->GetName().substr(0, 0x20)));
} }
for (const auto& nca_file : d2_dir->GetFiles()) { for (const auto& nca_file : d2_dir->GetFiles()) {
if (!FollowsNcaIdFormat(nca_file->GetName())) if (nca_file == nullptr || !FollowsNcaIdFormat(nca_file->GetName())) {
continue; continue;
}
ids.push_back( ids.push_back(
Common::HexStringToArray<0x10, true>(nca_file->GetName().substr(0, 0x20))); Common::HexStringToArray<0x10, true>(nca_file->GetName().substr(0, 0x20)));