Skip to content

Commit 1335512

Browse files
committed
Fix MachO loading some settings too early
Fixes #7117
1 parent df0d8aa commit 1335512

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

view/macho/machoview.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,6 @@ MachoView::MachoView(const string& typeName, BinaryView* data, bool parseOnly):
203203
Ref<BinaryViewType> universalViewType = BinaryViewType::GetByName("Universal");
204204
bool isUniversal = (universalViewType && universalViewType->IsTypeValidForData(data));
205205

206-
Ref<Settings> viewSettings = Settings::Instance();
207-
m_extractMangledTypes = viewSettings->Get<bool>("analysis.extractTypesFromMangledNames", data);
208-
m_simplifyTemplates = viewSettings->Get<bool>("analysis.types.templateSimplifier", data);
209-
210206
Ref<Settings> settings = data->GetLoadSettings(typeName);
211207
if (settings && settings->Contains("loader.macho.universalImageOffset"))
212208
{
@@ -1096,6 +1092,10 @@ bool MachoView::Init()
10961092

10971093
SetOriginalImageBase(initialImageBase);
10981094
uint64_t preferredImageBase = initialImageBase;
1095+
Ref<Settings> viewSettings = Settings::Instance();
1096+
m_extractMangledTypes = viewSettings->Get<bool>("analysis.extractTypesFromMangledNames", this);
1097+
m_simplifyTemplates = viewSettings->Get<bool>("analysis.types.templateSimplifier", this);
1098+
10991099
bool platformSetByUser = false;
11001100
if (settings)
11011101
{

0 commit comments

Comments
 (0)