From b184c7ec11b6260ec4ae2891ee29f6b644594558 Mon Sep 17 00:00:00 2001 From: KiritoDv Date: Mon, 19 Feb 2024 02:18:31 -0600 Subject: Fixed a crash on aasets that were autogenerated and compressed --- src/utils/Decompressor.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/utils/Decompressor.cpp') diff --git a/src/utils/Decompressor.cpp b/src/utils/Decompressor.cpp index a53177b..b4ca7a4 100644 --- a/src/utils/Decompressor.cpp +++ b/src/utils/Decompressor.cpp @@ -40,10 +40,13 @@ DecompressedData Decompressor::AutoDecode(YAML::Node& node, std::vector throw std::runtime_error("Failed to find offset"); } - const auto offset = TranslateAddr(node["offset"].as()); + auto offset = node["offset"].as(); if(node["mio0"]){ const auto mio0 = node["mio0"].as(); + + offset = TranslateAddr(offset, IS_SEGMENTED(offset)); + auto decoded = Decode(buffer, offset, CompressionType::MIO0); auto size = node["size"] ? node["size"].as() : manualSize.value_or(decoded->size - mio0); @@ -61,13 +64,15 @@ DecompressedData Decompressor::AutoDecode(YAML::Node& node, std::vector throw std::runtime_error("Yaz0 not implemented"); } + offset = TranslateAddr(offset); + return { .root = nullptr, .segment = { buffer.data() + offset, node["size"] ? node["size"].as() : manualSize.value_or(buffer.size() - offset) } }; } -uint32_t Decompressor::TranslateAddr(uint32_t addr){ +uint32_t Decompressor::TranslateAddr(uint32_t addr, bool baseAddress){ if(IS_SEGMENTED(addr)){ const auto segment = Companion::Instance->GetSegmentedAddr(SEGMENT_NUMBER(addr)); @@ -76,7 +81,7 @@ uint32_t Decompressor::TranslateAddr(uint32_t addr){ return 0; } - return segment.value() + SEGMENT_OFFSET(addr); + return segment.value() + (!baseAddress ? SEGMENT_OFFSET(addr) : 0); } return addr; -- cgit v1.2.3