Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-17 18:59:21 +01:00
Code Releases Wiki Activity

fix: Process memory provider region parsing skipping unnamed regions

Browse Source
This commit is contained in:
WerWolv 2024-07-16 17:58:49 +02:00
parent 7652b4a5b8
commit fc40e8ba70
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/builtin/source/content/providers/process_memory_provider.cpp
View File

@ -118,7 +118,7 @@ namespace hex::plugin::builtin {
std::pair<Region, bool> ProcessMemoryProvider::getRegionValidity(u64 address) const { std::pair<Region, bool> ProcessMemoryProvider::getRegionValidity(u64 address) const {
for (const auto &memoryRegion : m_memoryRegions) { for (const auto &memoryRegion : m_memoryRegions) {
if (memoryRegion.region.overlaps({ address, 1 })) if (memoryRegion.region.overlaps({ address, 1LLU }))
return { memoryRegion.region, true }; return { memoryRegion.region, true };
} }
@ -126,7 +126,7 @@ namespace hex::plugin::builtin {
for (const auto &memoryRegion : m_memoryRegions) { for (const auto &memoryRegion : m_memoryRegions) {
if (address < memoryRegion.region.getStartAddress()) if (address < memoryRegion.region.getStartAddress())
return { Region { lastRegion.getEndAddress() + 1, memoryRegion.region.getStartAddress() - lastRegion.getEndAddress() }, false }; return { Region { lastRegion.getEndAddress() + 1LLU, memoryRegion.region.getStartAddress() - lastRegion.getEndAddress() }, false };
lastRegion = memoryRegion.region; lastRegion = memoryRegion.region;
} }
@ -429,14 +429,17 @@ namespace hex::plugin::builtin {
if (!file.isValid()) if (!file.isValid())
return; return;
for (const auto &line : wolv::util::splitString(file.readString(0xF'FFFF), "\n")) { for (const auto &line : wolv::util::splitString(file.readString(), "\n")) {
const auto &split = wolv::util::splitString(line, " "); const auto &split = splitString(line, " ");
if (split.size() < 6) if (split.size() < 5)
continue; continue;
const u64 start = std::stoull(split[0].substr(0, split[0].find('-')), nullptr, 16); const u64 start = std::stoull(split[0].substr(0, split[0].find('-')), nullptr, 16);
const u64 end = std::stoull(split[0].substr(split[0].find('-') + 1), nullptr, 16); const u64 end = std::stoull(split[0].substr(split[0].find('-') + 1), nullptr, 16);
const auto &name = split[5];
std::string name;
if (split.size() >= 5)
name = combineStrings(std::vector(split.begin() + 5, split.end()), " ");
m_memoryRegions.insert({ { start, end - start }, name }); m_memoryRegions.insert({ { start, end - start }, name });
} }