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

Merge pull request #8100 from Morph1984/registered-crash

Browse source 
registered_cache: Prevent nullptr dereference when accumulating files
This commit is contained in:
bunnei 2022-04-05 18:18:41 -07:00 committed by GitHub
commit 0c1b954e07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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)));