summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Smith <glenn@vector35.com>2025-07-17 14:23:14 -0400
committerGlenn Smith <glenn@vector35.com>2025-07-21 12:53:00 -0400
commit1335512648312125662303787867960394429749 (patch)
tree062ceeabf07f5e5612c05cb22dc85ce16027b017
parentdf0d8aaeeed4be4d3aa9c8545088646e6c95e2ef (diff)
Fix MachO loading some settings too early
Fixes #7117
-rw-r--r--view/macho/machoview.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/view/macho/machoview.cpp b/view/macho/machoview.cpp
index dba8f9dc..339d9e06 100644
--- a/view/macho/machoview.cpp
+++ b/view/macho/machoview.cpp
@@ -203,10 +203,6 @@ MachoView::MachoView(const string& typeName, BinaryView* data, bool parseOnly):
Ref<BinaryViewType> universalViewType = BinaryViewType::GetByName("Universal");
bool isUniversal = (universalViewType && universalViewType->IsTypeValidForData(data));
- Ref<Settings> viewSettings = Settings::Instance();
- m_extractMangledTypes = viewSettings->Get<bool>("analysis.extractTypesFromMangledNames", data);
- m_simplifyTemplates = viewSettings->Get<bool>("analysis.types.templateSimplifier", data);
-
Ref<Settings> settings = data->GetLoadSettings(typeName);
if (settings && settings->Contains("loader.macho.universalImageOffset"))
{
@@ -1096,6 +1092,10 @@ bool MachoView::Init()
SetOriginalImageBase(initialImageBase);
uint64_t preferredImageBase = initialImageBase;
+ Ref<Settings> viewSettings = Settings::Instance();
+ m_extractMangledTypes = viewSettings->Get<bool>("analysis.extractTypesFromMangledNames", this);
+ m_simplifyTemplates = viewSettings->Get<bool>("analysis.types.templateSimplifier", this);
+
bool platformSetByUser = false;
if (settings)
{