Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix a crash when SAVEDATA_FILE_LIST is invalid.

Browse Source 
I think that's what caused this anyway.
This commit is contained in:
Unknown W. Brackets 2013-01-01 19:46:53 -08:00
parent f63a9d1d1f
commit f36a4b3a12
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/Dialog/SavedataParam.cpp
View File

@ -244,18 +244,20 @@ bool SavedataParam::Save(SceUtilitySavedataParam* param, int saveId)
sfoFile.SetValue("SAVEDATA_DIRECTORY",GetSaveDir(param,saveId),64);
// For each file, 13 bytes for filename, 16 bytes for file hash (0 in PPSSPP), 3 byte for padding
u8* tmpData = sfoFile.GetValueData("SAVEDATA_FILE_LIST", 0);
u32 tmpDataSize = 0;
u8* tmpData = sfoFile.GetValueData("SAVEDATA_FILE_LIST", &tmpDataSize);
u8* tmpData2 = 0;
if(tmpData == 0)
{
tmpData2 = new u8[3168]; // 99 filename max
tmpData = tmpData2;
tmpDataSize = 3168;
memset(tmpData, 0, 3168);
}
if(param->dataBuf != 0)
{
char* fName = (char*)tmpData;
for(int i = 0; i < 99; i++)
char *fName = (char*)tmpData;
for(int i = 0; i < 99 && fName < (char*)tmpData + tmpDataSize; i++)
{
if(fName[0] == 0)
break; // End of list
@ -264,7 +266,9 @@ bool SavedataParam::Save(SceUtilitySavedataParam* param, int saveId)
fName += 32;
}
snprintf(fName, 20,"%s",GetFileName(param).c_str());
if (fName + 20 <= (char*)tmpData + tmpDataSize)
snprintf(fName, 20, "%s",GetFileName(param).c_str());
}
sfoFile.SetValue("SAVEDATA_FILE_LIST", tmpData, 3168, 3168);
if(tmpData2)

19
Core/ELF/ParamSFO.h
View File

@ -54,15 +54,18 @@ private:
void SetData(const u8* data, int size)
{
if(u_value)
if (data != u_value)
{
delete[] u_value;
u_value = 0;
}
if(size > 0)
{
u_value = new u8[size];
memcpy(u_value,data,size);
if(u_value)
{
delete[] u_value;
u_value = 0;
}
if(size > 0)
{
u_value = new u8[size];
memcpy(u_value, data, size);
}
}
u_size = size;
}