From a37d1dc804f2f14771435aeefcfc43818fed79a2 Mon Sep 17 00:00:00 2001 From: kat Date: Tue, 16 Jul 2024 16:15:12 -0400 Subject: [Mach-O] Fix an error on Free builds --- view/macho/machoview.cpp | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/view/macho/machoview.cpp b/view/macho/machoview.cpp index 2180bb96..e26cf2df 100644 --- a/view/macho/machoview.cpp +++ b/view/macho/machoview.cpp @@ -1854,14 +1854,16 @@ bool MachoView::InitializeHeader(MachOHeader& header, bool isMainHeader, uint64_ } if (parseObjCStructs) { - if (!settings) // Add our defaults { Ref programSettings = Settings::Instance(); - if (programSettings->Get("corePlugins.workflows.objc")) + if (programSettings->Contains("corePlugins.workflows.objc")) { - programSettings->Set("workflows.enable", true, this); - programSettings->Set("workflows.functionWorkflow", "core.function.objectiveC", this); + if (programSettings->Get("corePlugins.workflows.objc")) + { + programSettings->Set("workflows.enable", true, this); + programSettings->Set("workflows.functionWorkflow", "core.function.objectiveC", this); + } } } } @@ -3906,10 +3908,13 @@ Ref MachoViewType::GetLoadSettingsForData(BinaryView* data) "description" : "Processes Objective-C structures, applying method names and types from encoded metadata" })"); Ref programSettings = Settings::Instance(); - if (programSettings->Get("corePlugins.workflows.objc")) + if (programSettings->Contains("corePlugins.workflows.objc")) { - programSettings->Set("workflows.enable", true, viewRef); - programSettings->Set("workflows.functionWorkflow", "core.function.objectiveC", viewRef); + if (programSettings->Get("corePlugins.workflows.objc")) + { + programSettings->Set("workflows.enable", true, viewRef); + programSettings->Set("workflows.functionWorkflow", "core.function.objectiveC", viewRef); + } } } if (viewRef->GetSectionByName("__cfstring")) -- cgit v1.3.1