hans/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2026-08-28 15:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

ok but fixed for realsies?

Browse Source
This commit is contained in:
lizzie
2026-08-13 16:57:41 +00:00
committed by crueter
parent b9c1b8c5e2
commit 42dc3ae3d3
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/file_sys/ips_layer.cpp
+13 -16
View File
@@ -121,7 +121,7 @@ std::array<u8, 32> IPSwitchCompiler::GetBuildID() const {
static IPSwitchRecord EscapeStringSequences(std::string_view sv) { static IPSwitchRecord EscapeStringSequences(std::string_view sv) {
IPSwitchRecord r{}; IPSwitchRecord r{};
for (auto it = sv.cbegin(); it != sv.cend(); ) { for (auto it = sv.cbegin(); it != sv.cend(); ) {
if (*it == '\\') { if (*it == '\\' && it + 1 < sv.cend()) {
switch (it[1]) { switch (it[1]) {
case 'n': r.data[r.count] = '\n'; break; case 'n': r.data[r.count] = '\n'; break;
case 't': r.data[r.count] = '\t'; break; case 't': r.data[r.count] = '\t'; break;
@@ -156,6 +156,7 @@ void IPSwitchCompiler::Parse(std::span<u8 const> bytes) {
//bool print_values = false; //bool print_values = false;
auto const parse_line = [&](std::string_view const line) { auto const parse_line = [&](std::string_view const line) {
// Keep in mind lines have trimmed spaces (at the end & start)!
LOG_INFO(Loader, "<{}>", line); LOG_INFO(Loader, "<{}>", line);
if (line.starts_with("@stop")) { if (line.starts_with("@stop")) {
return false; // Force stop return false; // Force stop
@@ -191,22 +192,18 @@ void IPSwitchCompiler::Parse(std::span<u8 const> bytes) {
} else { } else {
LOG_WARNING(Loader, "invalid string"); LOG_WARNING(Loader, "invalid string");
} }
} else if (auto const first_space = line.find_first_of(" /\t\r\n"); first_space != std::string::npos) { } else if (auto const first_space = line.find_last_of(" /\t\r\n"); first_space != std::string::npos) {
IPSwitchRecord r; // hex replacement IPSwitchRecord r{}; // hex replacement
auto const start = line.cbegin() + first_space; auto const start = line.cbegin() + first_space + 1;
if (auto const last_space = line.find_last_of(" /\t\r\n"); last_space != std::string::npos) { auto const end = line.cend();
auto const end = line.cbegin() + last_space; if (start <= line.cend() && end <= line.cend()) {
if (start <= line.cend() && end <= line.cend()) { auto const hs = Common::HexStringToVector({start, end}, is_little_endian);
auto const hs = Common::HexStringToVector({start, end}, is_little_endian); std::memcpy(r.data.data(), hs.data(), hs.size());
std::memcpy(r.data.data(), hs.data(), hs.size()); r.count = hs.size();
r.count = hs.size(); LOG_INFO(Loader, "[H] value @ {:#08X}", offset);
LOG_INFO(Loader, "[H] value @ {:#08X} ", offset); patches.back().records.insert_or_assign(u32(offset), std::move(r));
patches.back().records.insert_or_assign(u32(offset), std::move(r));
} else {
LOG_WARNING(Loader, "invalid line");
}
} else { } else {
LOG_WARNING(Loader, "no last space"); LOG_WARNING(Loader, "invalid line");
} }
} else { } else {
LOG_WARNING(Loader, "unhandled line!"); LOG_WARNING(Loader, "unhandled line!");