From a8ad045248a31dbc38ad0afb2f79eb96f6af0748 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Fri, 26 Jul 2024 19:43:15 +0200 Subject: [PATCH] fix: Parent offset calculation with non-zero base addresses --- .../builtin/source/content/views/view_pattern_editor.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/builtin/source/content/views/view_pattern_editor.cpp b/plugins/builtin/source/content/views/view_pattern_editor.cpp index 5533e8e78..0bf342f61 100644 --- a/plugins/builtin/source/content/views/view_pattern_editor.cpp +++ b/plugins/builtin/source/content/views/view_pattern_editor.cpp @@ -1529,9 +1529,11 @@ namespace hex::plugin::builtin { ImGui::Unindent(); { + const auto provider = ImHexApi::Provider::get(); + const auto baseAddress = provider != nullptr ? provider->getBaseAddress() : 0x00; const auto parent = pattern->getParent(); - const auto parentAddress = parent == nullptr ? 0x00 : parent->getOffset(); - const auto parentSize = parent == nullptr ? 0x00 : parent->getSize(); + const auto parentAddress = parent == nullptr ? baseAddress : parent->getOffset(); + const auto parentSize = parent == nullptr ? baseAddress : parent->getSize(); const auto patternAddress = pattern->getOffset(); if (patternAddress >= parentAddress && patternAddress + pattern->getSize() <= parentAddress + parentSize) {