From d0c1112405a9ff49aa04ff9173b25acd1dde8440 Mon Sep 17 00:00:00 2001 From: coco875 Date: Mon, 22 Dec 2025 18:05:01 +0100 Subject: avoid goes beyond limit when decompressing --- src/utils/Decompressor.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/utils/Decompressor.cpp') diff --git a/src/utils/Decompressor.cpp b/src/utils/Decompressor.cpp index f69872b..dd24650 100644 --- a/src/utils/Decompressor.cpp +++ b/src/utils/Decompressor.cpp @@ -123,7 +123,8 @@ DecompressedData Decompressor::AutoDecode(YAML::Node& node, std::vector offset = ASSET_PTR(offset); auto decoded = Decode(buffer, fileOffset, type); - auto size = node["size"] ? node["size"].as() : manualSize.value_or(decoded->size - offset); + auto availableSize = decoded->size - offset; + auto size = node["size"] ? node["size"].as() : std::min(manualSize.value_or(availableSize), availableSize); return { .root = decoded, .segment = { decoded->data + offset, size } @@ -135,7 +136,8 @@ DecompressedData Decompressor::AutoDecode(YAML::Node& node, std::vector { fileOffset = TranslateAddr(offset, false); - auto size = node["size"] ? node["size"].as() : manualSize.value_or(buffer.size() - fileOffset); + auto availableSize = buffer.size() - fileOffset; + auto size = node["size"] ? node["size"].as() : std::min(manualSize.value_or(availableSize), availableSize); return { .root = nullptr, -- cgit v1.2.3