ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6671 from leoetlino/bug 

IOS/FS: Fix ReadDir bugs
This commit is contained in:
Léo Lam 2018-04-20 17:58:11 +02:00 committed by GitHub
parent a500347345 1176ae6512
commit e169329e5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/IOS/FS/FileSystemProxy.cpp
View File

@ -467,8 +467,10 @@ IPCCommandResult FS::ReadDirectory(const Handle& handle, const IOCtlVRequest& re
Memory::Memset(file_list_address, 0, 13); Memory::Memset(file_list_address, 0, 13);
Memory::CopyToEmu(file_list_address, (*list)[i].data(), (*list)[i].size()); Memory::CopyToEmu(file_list_address, (*list)[i].data(), (*list)[i].size());
Memory::Write_U8(0, file_list_address + 12); Memory::Write_U8(0, file_list_address + 12);
file_list_address += 13; file_list_address += static_cast<u32>((*list)[i].size()) + 1;
} }
// Write the actual number of entries in the buffer.
Memory::Write_U32(std::min(max_count, static_cast<u32>(list->size())), file_count_address);
return GetFSReply(IPC_SUCCESS); return GetFSReply(IPC_SUCCESS);
} }