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

Respect param len in PARAM.SFO parser

Browse source
This commit is contained in:
Henrik Rydgard 2012-12-01 10:33:05 +01:00
parent 6e32b30afd
commit ab4482a0a4
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Core/ELF/ParamSFO.cpp
View file

@ -36,12 +36,17 @@ struct IndexTable
u32 data_table_offset; /* Offset of the param_data from start of data_table */ u32 data_table_offset; /* Offset of the param_data from start of data_table */
}; };
void ParseDataString(const char *key, const char *utfdata, ParamSFOData *sfodata) void ParseDataString(const char *key, const char *utfdata, ParamSFOData *sfodata, int maxlen = 0)
{ {
std::string data;
if (maxlen)
data = std::string(utfdata, maxlen);
else
data = std::string(utfdata);
if (!strcmp(key, "DISC_ID")) { if (!strcmp(key, "DISC_ID")) {
sfodata->discID = utfdata; sfodata->discID = data;
} else if (!strcmp(key, "TITLE")) { } else if (!strcmp(key, "TITLE")) {
sfodata->title = utfdata; sfodata->title = data;
} }
} }
@ -59,7 +64,7 @@ bool ParseParamSFO(const u8 *paramsfo, size_t size, ParamSFOData *data)
const u8 *key_start = paramsfo + header->key_table_start; const u8 *key_start = paramsfo + header->key_table_start;
const u8 *data_start = paramsfo + header->data_table_start; const u8 *data_start = paramsfo + header->data_table_start;
for (int i = 0; i < header->index_table_entries; i++) for (u32 i = 0; i < header->index_table_entries; i++)
{ {
const char *key = (const char *)(key_start + indexTables[i].key_table_offset); const char *key = (const char *)(key_start + indexTables[i].key_table_offset);
@ -76,7 +81,7 @@ bool ParseParamSFO(const u8 *paramsfo, size_t size, ParamSFOData *data)
{ {
const char *utfdata = (const char *)(data_start + indexTables[i].data_table_offset); const char *utfdata = (const char *)(data_start + indexTables[i].data_table_offset);
DEBUG_LOG(LOADER, "%s %s", key, utfdata); DEBUG_LOG(LOADER, "%s %s", key, utfdata);
ParseDataString(key, utfdata, data); ParseDataString(key, utfdata, data, indexTables[i].param_len);
} }
break; break;
case 0x0204: case 0x0204:
@ -84,7 +89,7 @@ bool ParseParamSFO(const u8 *paramsfo, size_t size, ParamSFOData *data)
{ {
const char *utfdata = (const char *)(data_start + indexTables[i].data_table_offset); const char *utfdata = (const char *)(data_start + indexTables[i].data_table_offset);
DEBUG_LOG(LOADER, "%s %s", key, utfdata); DEBUG_LOG(LOADER, "%s %s", key, utfdata);
ParseDataString(key, utfdata, data); ParseDataString(key, utfdata, data, indexTables[i].param_len);
} }
break; break;
} }