Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add some basic sanity checks to ParamSFO reader (could add more)

Browse source
This commit is contained in:
Henrik Rydgård 2021-10-07 21:08:12 +02:00
parent 21686a6a93
commit 9c017e03f9
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Core/ELF/ParamSFO.cpp
View file

@ -103,19 +103,22 @@ bool ParamSFOData::ReadSFO(const u8 *paramsfo, size_t size) {
const IndexTable *indexTables = (const IndexTable *)(paramsfo + sizeof(Header));
if (header->key_table_start > size || header->data_table_start > size) {
return false;
}
const u8 *key_start = paramsfo + header->key_table_start;
const u8 *data_start = paramsfo + header->data_table_start;
for (u32 i = 0; i < header->index_table_entries; i++)
{
const char *key = (const char *)(key_start + indexTables[i].key_table_offset);
switch (indexTables[i].param_fmt) {
case 0x0404:
{
// Unsigned int
const u32_le *data = (const u32_le *)(data_start + indexTables[i].data_table_offset);
SetValue(key,*data,indexTables[i].param_max_len);
SetValue(key, *data, indexTables[i].param_max_len);
VERBOSE_LOG(LOADER, "%s %08x", key, *data);
}
break;
@ -132,7 +135,7 @@ bool ParamSFOData::ReadSFO(const u8 *paramsfo, size_t size) {
{
const char *utfdata = (const char *)(data_start + indexTables[i].data_table_offset);
VERBOSE_LOG(LOADER, "%s %s", key, utfdata);
SetValue(key,std::string(utfdata /*, indexTables[i].param_len*/), indexTables[i].param_max_len);
SetValue(key, std::string(utfdata /*, indexTables[i].param_len*/), indexTables[i].param_max_len);
}
break;
}

6
Core/ELF/ParamSFO.h
View file

@ -56,7 +56,11 @@ public:
bool WriteSFO(u8 **paramsfo, size_t *size);
bool ReadSFO(const std::vector<u8> &paramsfo) {
return ReadSFO(&paramsfo[0], paramsfo.size());
if (!paramsfo.empty()) {
return ReadSFO(&paramsfo[0], paramsfo.size());
} else {
return false;
}
}
int GetDataOffset(const u8 *paramsfo, std::string dataName);