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

Patch: Discard patches with non-hex addresses/values

This commit is contained in:
Stenzek 2023-05-24 19:34:23 +10:00 committed by refractionpcsx2
parent 884086ba76
commit bba65b8a82
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pcsx2/Patch.cpp
View File

@ -245,21 +245,39 @@ namespace PatchFunc
return; return;
} }
std::string_view placetopatch_end;
const std::optional<u32> placetopatch = StringUtil::FromChars<u32>(pieces[0], 10, &placetopatch_end);
IniPatch iPatch = {0}; IniPatch iPatch = {0};
iPatch.enabled = 0; iPatch.enabled = 0;
iPatch.placetopatch = StringUtil::FromChars<u32>(pieces[0]).value_or(_PPT_END_MARKER); iPatch.placetopatch = StringUtil::FromChars<u32>(pieces[0]).value_or(_PPT_END_MARKER);
if (iPatch.placetopatch >= _PPT_END_MARKER) if (!placetopatch.has_value() || !placetopatch_end.empty() ||
(iPatch.placetopatch = placetopatch.value()) >= _PPT_END_MARKER)
{ {
PATCH_ERROR("Invalid 'place' value '%.*s' (0 - once on startup, 1: continuously)", PATCH_ERROR("Invalid 'place' value '%.*s' (0 - once on startup, 1: continuously)",
static_cast<int>(pieces[0].size()), pieces[0].data()); static_cast<int>(pieces[0].size()), pieces[0].data());
return; return;
} }
std::string_view addr_end, data_end;
const std::optional<u32> addr = StringUtil::FromChars<u32>(pieces[2], 16, &addr_end);
const std::optional<u32> data = StringUtil::FromChars<u32>(pieces[4], 16, &data_end);
if (!addr.has_value() || !addr_end.empty())
{
PATCH_ERROR("Malformed address '%.*s', a hex number is expected", static_cast<int>(pieces[2].size()), pieces[2].data());
return;
}
else if (!data.has_value() || !data_end.empty())
{
PATCH_ERROR("Malformed data '%.*s', a hex number is expected", static_cast<int>(pieces[4].size()), pieces[4].data());
return;
}
iPatch.cpu = (patch_cpu_type)PatchTableExecute(pieces[1], std::string_view(), cpuCore); iPatch.cpu = (patch_cpu_type)PatchTableExecute(pieces[1], std::string_view(), cpuCore);
iPatch.addr = StringUtil::FromChars<u32>(pieces[2], 16).value_or(0); iPatch.addr = addr.value();
iPatch.type = (patch_data_type)PatchTableExecute(pieces[3], std::string_view(), dataType); iPatch.type = (patch_data_type)PatchTableExecute(pieces[3], std::string_view(), dataType);
iPatch.data = StringUtil::FromChars<u64>(pieces[4], 16).value_or(0); iPatch.data = data.value();
if (iPatch.cpu == 0) if (iPatch.cpu == 0)
{ {