archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 08:21:29 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

cellSaveData: Clear traces of setList setup from setBuf->buf, add missing memset

Browse source 
* Always memset 0 setBuf->buf (to bufSize) before funcStat if the direcory is not new.
* Always memset 0 setBuf->buf (to bufSize) if listGet->dirNum became non-zero (listGet->dirListNum can be zero yet memset still occurs) .
* Clear traces of setList setup before funcStat (after funcFixed/List, only if listGet->dirNum != 0, callback can hack this value and prevent the memset).
This commit is contained in:
Eladash 2020-03-20 18:39:04 +02:00 • committed by Ivan
parent b6a288d383
commit ceaee0ec68
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
rpcs3/Emu/Cell/Modules/cellSaveData.cpp
View file

@ -613,7 +613,12 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
if (entry.name.starts_with(prefix)) if (entry.name.starts_with(prefix))
{ {
// Count the amount of matches and the amount of listed directories // Count the amount of matches and the amount of listed directories
listGet->dirNum++; // total number of directories if (!listGet->dirNum++) // total number of directories
{
// Clear buf exactly to bufSize only if dirNum becomes non-zero (regardless of dirListNum)
std::memset(setBuf->buf.get_ptr(), 0, setBuf->bufSize);
}
if (listGet->dirListNum < setBuf->dirListMax) if (listGet->dirListNum < setBuf->dirListMax)
{ {
listGet->dirListNum++; // number of directories in list listGet->dirListNum++; // number of directories in list
@ -690,7 +695,6 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
auto& dir = *dir_list++; auto& dir = *dir_list++;
strcpy_trunc(dir.dirName, entry.dirName); strcpy_trunc(dir.dirName, entry.dirName);
strcpy_trunc(dir.listParam, entry.listParam); strcpy_trunc(dir.listParam, entry.listParam);
std::memset(dir.reserved, 0, sizeof(dir.reserved));
} }
s32 selected = -1; s32 selected = -1;
@ -1180,6 +1184,12 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
} }
} }
if (listGet->dirNum)
{
// Clear buf exactly to bufSize again after funcFixed/List (for funcStat)
std::memset(setBuf->buf.get_ptr(), 0, setBuf->bufSize);
}
if (selected >= 0) if (selected >= 0)
{ {
if (selected + 0u < save_entries.size()) if (selected + 0u < save_entries.size())
@ -1253,7 +1263,13 @@ static NEVER_INLINE error_code savedata_op(ppu_thread& ppu, u32 operation, u32 v
statGet->fileNum = 0; statGet->fileNum = 0;
statGet->fileList.set(setBuf->buf.addr()); statGet->fileList.set(setBuf->buf.addr());
statGet->fileListNum = 0; statGet->fileListNum = 0;
memset(statGet->reserved, 0, sizeof(statGet->reserved)); std::memset(statGet->reserved, 0, sizeof(statGet->reserved));
if (!save_entry.isNew)
{
// Clear to bufSize if !isNew regardless of fileNum
std::memset(setBuf->buf.get_ptr(), 0, setBuf->bufSize);
}
auto file_list = statGet->fileList.get_ptr(); auto file_list = statGet->fileList.get_ptr();