From 93bb3e8cf9ef789b5fdbf321815ed6108291786c Mon Sep 17 00:00:00 2001 From: Brian Potchik Date: Fri, 2 Aug 2019 22:05:36 -0400 Subject: Refactor settings system to be reference counted. --- binaryviewtype.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'binaryviewtype.cpp') diff --git a/binaryviewtype.cpp b/binaryviewtype.cpp index 815b508e..bd99bf80 100644 --- a/binaryviewtype.cpp +++ b/binaryviewtype.cpp @@ -43,11 +43,14 @@ bool BinaryViewType::IsValidCallback(void* ctxt, BNBinaryView* data) } -char* BinaryViewType::GetSettingsCallback(void* ctxt, BNBinaryView* data) +BNSettings* BinaryViewType::GetSettingsCallback(void* ctxt, BNBinaryView* data) { BinaryViewType* type = (BinaryViewType*)ctxt; Ref view = new BinaryView(BNNewViewReference(data)); - return BNAllocString(type->GetLoadSettingsForData(view).c_str()); + Ref result = type->GetLoadSettingsForData(view); + if (!result) + return nullptr; + return BNNewSettingsReference(result->GetObject()); } @@ -220,10 +223,10 @@ bool CoreBinaryViewType::IsTypeValidForData(BinaryView* data) } -string CoreBinaryViewType::GetLoadSettingsForData(BinaryView* data) +Ref CoreBinaryViewType::GetLoadSettingsForData(BinaryView* data) { - char* settings = BNGetBinaryViewLoadSettingsForData(m_object, data->GetObject()); - string result = settings; - BNFreeString(settings); - return result; + BNSettings* settings = BNGetBinaryViewLoadSettingsForData(m_object, data->GetObject()); + if (!settings) + return nullptr; + return new Settings(settings); } -- cgit v1.3.1