Merge remote-tracking branch 'origin/dev' into test_homegrown_powerpc_vle

Author: galenbwill

binaryninjacore.h

@@ -7138,7 +7138,7 @@ extern "C"
 	BINARYNINJACOREAPI void BNUnregisterScriptingInstanceOutputListener(
 	    BNScriptingInstance* instance, BNScriptingOutputListener* callbacks);
 
-	BINARYNINJACOREAPI const char* BNGetScriptingInstanceDelimiters(BNScriptingInstance* instance);
+	BINARYNINJACOREAPI char* BNGetScriptingInstanceDelimiters(BNScriptingInstance* instance);
 	BINARYNINJACOREAPI void BNSetScriptingInstanceDelimiters(BNScriptingInstance* instance, const char* delimiters);
 
 	BINARYNINJACOREAPI BNScriptingProviderInputReadyState BNGetScriptingInstanceInputReadyState(
@@ -8310,12 +8310,12 @@ extern "C"
 	BINARYNINJACOREAPI bool BNFirmwareNinjaRelationshipGetSecondaryAddress(BNFirmwareNinjaRelationship* rel, uint64_t* result);
 	BINARYNINJACOREAPI bool BNFirmwareNinjaRelationshipGetSecondaryDataVariable(BNFirmwareNinjaRelationship* rel, BNDataVariable* dataVariable);
 	BINARYNINJACOREAPI BNFunction* BNFirmwareNinjaRelationshipGetSecondaryFunction(BNFirmwareNinjaRelationship* rel);
-	BINARYNINJACOREAPI const char* BNFirmwareNinjaRelationshipGetSecondaryExternalSymbol(BNFirmwareNinjaRelationship* rel);
+	BINARYNINJACOREAPI char* BNFirmwareNinjaRelationshipGetSecondaryExternalSymbol(BNFirmwareNinjaRelationship* rel);
 	BINARYNINJACOREAPI void BNFirmwareNinjaRelationshipSetDescription(BNFirmwareNinjaRelationship* rel, const char* description);
-	BINARYNINJACOREAPI const char* BNFirmwareNinjaRelationshipGetDescription(BNFirmwareNinjaRelationship* rel);
+	BINARYNINJACOREAPI char* BNFirmwareNinjaRelationshipGetDescription(BNFirmwareNinjaRelationship* rel);
 	BINARYNINJACOREAPI void BNFirmwareNinjaRelationshipSetProvenance(BNFirmwareNinjaRelationship* rel, const char* provenance);
-	BINARYNINJACOREAPI const char* BNFirmwareNinjaRelationshipGetProvenance(BNFirmwareNinjaRelationship* rel);
-	BINARYNINJACOREAPI const char* BNFirmwareNinjaRelationshipGetGuid(BNFirmwareNinjaRelationship* rel);
+	BINARYNINJACOREAPI char* BNFirmwareNinjaRelationshipGetProvenance(BNFirmwareNinjaRelationship* rel);
+	BINARYNINJACOREAPI char* BNFirmwareNinjaRelationshipGetGuid(BNFirmwareNinjaRelationship* rel);
 
 	// Line formatters
 	BINARYNINJACOREAPI BNLineFormatter* BNRegisterLineFormatter(const char* name, BNCustomLineFormatter* callbacks);

binaryview.cpp

@@ -939,7 +939,10 @@ void TagType::SetName(const std::string& name)
 
 std::string TagType::GetIcon() const
 {
-	return BNTagTypeGetIcon(m_object);
+	char* str = BNTagTypeGetIcon(m_object);
+	string result = str;
+	BNFreeString(str);
+	return result;
 }
 
 
@@ -1002,7 +1005,10 @@ Ref<TagType> Tag::GetType() const
 
 std::string Tag::GetData() const
 {
-	return BNTagGetData(m_object);
+	char* str = BNTagGetData(m_object);
+	string result = str;
+	BNFreeString(str);
+	return result;
 }
 
 
@@ -1278,13 +1284,19 @@ uint64_t Section::GetEntrySize() const
 
 std::string Section::GetLinkedSection() const
 {
-	return BNSectionGetLinkedSection(m_object);
+	char* str = BNSectionGetLinkedSection(m_object);
+	string result = str;
+	BNFreeString(str);
+	return result;
 }
 
 
 std::string Section::GetInfoSection() const
 {
-	return BNSectionGetInfoSection(m_object);
+	char* str = BNSectionGetInfoSection(m_object);
+	string result = str;
+	BNFreeString(str);
+	return result;
 }
 
 

firmwareninja.cpp

@@ -251,11 +251,11 @@ Ref<Function> FirmwareNinjaRelationship::GetSecondaryFunction() const
 
 std::string FirmwareNinjaRelationship::GetSecondaryExternalSymbol() const
 {
-	std::string result = "";
 	auto bnSymbol = BNFirmwareNinjaRelationshipGetSecondaryExternalSymbol(m_object);
-	if (bnSymbol)
-		result = std::string(bnSymbol);
-
+	if (!bnSymbol)
+		return "";
+	std::string result = bnSymbol;
+	BNFreeString(bnSymbol);
 	return result;
 }
 
@@ -268,11 +268,11 @@ void FirmwareNinjaRelationship::SetDescription(const std::string& description)
 
 std::string FirmwareNinjaRelationship::GetDescription() const
 {
-	std::string result = "";
 	auto bnDescription = BNFirmwareNinjaRelationshipGetDescription(m_object);
-	if (bnDescription)
-		result = std::string(bnDescription);
-
+	if (!bnDescription)
+		return "";
+	std::string result = bnDescription;
+	BNFreeString(bnDescription);
 	return result;
 }
 
@@ -285,18 +285,23 @@ void FirmwareNinjaRelationship::SetProvenance(const std::string& provenance)
 
 std::string FirmwareNinjaRelationship::GetProvenance() const
 {
-	std::string result = "";
 	auto bnProvenance = BNFirmwareNinjaRelationshipGetProvenance(m_object);
-	if (bnProvenance)
-		result = std::string(bnProvenance);
-
+	if (!bnProvenance)
+		return "";
+	std::string result = bnProvenance;
+	BNFreeString(bnProvenance);
 	return result;
 }
 
 
 std::string FirmwareNinjaRelationship::GetGuid() const
 {
-	return BNFirmwareNinjaRelationshipGetGuid(m_object);
+	auto bnGuid = BNFirmwareNinjaRelationshipGetGuid(m_object);
+	if (!bnGuid)
+		return "";
+	std::string result = bnGuid;
+	BNFreeString(bnGuid);
+	return result;
 }
 
 

plugins/dwarf/dwarfdump/src/lib.rs

@@ -20,7 +20,6 @@ use binaryninja::{
 };
 use dwarfreader::is_valid;
 
-use binaryninja::disassembly::StringType;
 use gimli::{
     AttributeValue::{Encoding, Flag, UnitRef},
     // BigEndian,
@@ -33,6 +32,7 @@ use gimli::{
     Unit,
     UnitSectionOffset,
 };
+use binaryninja::binary_view::StringType;
 
 static PADDING: [&str; 23] = [
     "",

plugins/pdb-ng/src/lib.rs

@@ -538,7 +538,7 @@ impl PDBParser {
 
 impl CustomDebugInfoParser for PDBParser {
     fn is_valid(&self, view: &BinaryView) -> bool {
-        view.type_name() == "PE" || is_pdb(view)
+        view.view_type() == "PE" || is_pdb(view)
     }
 
     fn parse_info(

python/binaryview.py

@@ -2998,15 +2998,13 @@ def llil_basic_blocks(self) -> Generator['lowlevelil.LowLevelILBasicBlock', None
 	def mlil_basic_blocks(self) -> Generator['mediumlevelil.MediumLevelILBasicBlock', None, None]:
 		"""A generator of all MediumLevelILBasicBlock objects in the BinaryView"""
 		for func in self.mlil_functions():
-			if func is not None:
-				yield from func.basic_blocks
+			yield from func.basic_blocks
 
 	@property
 	def hlil_basic_blocks(self) -> Generator['highlevelil.HighLevelILBasicBlock', None, None]:
 		"""A generator of all HighLevelILBasicBlock objects in the BinaryView"""
 		for func in self.hlil_functions():
-			if func is not None:
-				yield from func.basic_blocks
+			yield from func.basic_blocks
 
 	@property
 	def instructions(self) -> InstructionsType:
@@ -3195,7 +3193,9 @@ def mlil_functions(
 		for func in AdvancedILFunctionList(
 		    self, self.preload_limit if preload_limit is None else preload_limit, function_generator
 		):
-			yield func.mlil
+			mlil = func.mlil
+			if mlil is not None:
+				yield mlil
 
 	def hlil_functions(
 	    self, preload_limit: Optional[int] = None,
@@ -3208,7 +3208,9 @@ def hlil_functions(
 		for func in AdvancedILFunctionList(
 		    self, self.preload_limit if preload_limit is None else preload_limit, function_generator
 		):
-			yield func.hlil
+			hlil = func.hlil
+			if hlil is not None:
+				yield hlil
 
 	@property
 	def has_functions(self) -> bool:

python/function.py

@@ -1549,13 +1549,21 @@ def comment(self, comment: str) -> None:
 	@property
 	def llil_basic_blocks(self) -> Generator['lowlevelil.LowLevelILBasicBlock', None, None]:
 		"""A generator of all LowLevelILBasicBlock objects in the current function"""
-		for block in self.llil:
+		llil = self.llil
+		if llil is None:
+			return
+
+		for block in llil:
 			yield block
 
 	@property
 	def mlil_basic_blocks(self) -> Generator['mediumlevelil.MediumLevelILBasicBlock', None, None]:
 		"""A generator of all MediumLevelILBasicBlock objects in the current function"""
-		for block in self.mlil:
+		mlil = self.mlil
+		if mlil is None:
+			return
+
+		for block in mlil:
 			yield block
 
 	@property
@@ -1883,6 +1891,10 @@ def get_llils_at(self, addr: int,
 			>>> func.get_llils_at(func.start)
 			[<il: push(rbp)>]
 		"""
+		llil = self.llil
+		if llil is None:
+			return []
+
 		if arch is None:
 			arch = self.arch
 		count = ctypes.c_ulonglong()
@@ -1891,7 +1903,7 @@ def get_llils_at(self, addr: int,
 		try:
 			result = []
 			for i in range(0, count.value):
-				result.append(self.llil[instrs[i]])
+				result.append(llil[instrs[i]])
 			return result
 		finally:
 			core.BNFreeILInstructionList(instrs)

rust/src/basic_block.rs

@@ -30,7 +30,7 @@ pub struct Edge<'a, C: 'a + BlockContext> {
     pub branch: BranchType,
     pub back_edge: bool,
     pub source: Guard<'a, BasicBlock<C>>,
-    target: Guard<'a, BasicBlock<C>>,
+    pub target: Guard<'a, BasicBlock<C>>,
 }
 
 impl<'a, C: 'a + fmt::Debug + BlockContext> fmt::Debug for Edge<'a, C> {