Fix demangler no-type result handling

Author: plafosse

demangle.cpp

@@ -7,16 +7,15 @@ namespace BinaryNinja {
 	bool DemangleGeneric(Ref<Architecture> arch, const std::string& name, Ref<Type>& outType,
 		QualifiedName& outVarName, Ref<BinaryView> view, bool simplify)
 	{
-		BNType* apiType;
+		BNType* apiType = nullptr;
 		BNQualifiedName apiVarName;
 		bool success = BNDemangleGeneric(
 			arch->m_object, name.c_str(), &apiType, &apiVarName, view ? view->m_object : nullptr, simplify);
 
 		if (!success)
 			return false;
 
-		if (apiType)
-			outType = new Type(apiType);
+		outType = apiType ? new Type(apiType) : nullptr;
 		outVarName = QualifiedName::FromAPIObject(&apiVarName);
 		BNFreeQualifiedName(&apiVarName);
 		return true;
@@ -89,7 +88,7 @@ namespace BinaryNinja {
 	bool DemangleGNU3(Ref<Architecture> arch, const std::string& mangledName, Ref<Type>& outType, QualifiedName& outVarName,
 	    const bool simplify)
 	{
-		BNType* localType;
+		BNType* localType = nullptr;
 		char** localVarName = nullptr;
 		size_t localSize = 0;
 		if (!BNDemangleGNU3(arch->GetObject(), mangledName.c_str(), &localType, &localVarName, &localSize, simplify))
@@ -242,16 +241,15 @@ namespace BinaryNinja {
 	bool CoreDemangler::Demangle(Ref<Architecture> arch, const std::string& name, Ref<Type>& outType,
 		QualifiedName& outVarName, Ref<BinaryView> view)
 	{
-		BNType* apiType;
+		BNType* apiType = nullptr;
 		BNQualifiedName apiVarName;
 		bool success = BNDemanglerDemangle(
 			m_object, arch->m_object, name.c_str(), &apiType, &apiVarName, view ? view->m_object : nullptr);
 
 		if (!success)
 			return false;
 
-		if (apiType)
-			outType = new Type(apiType);
+		outType = apiType ? new Type(apiType) : nullptr;
 		outVarName = QualifiedName::FromAPIObject(&apiVarName);
 		BNFreeQualifiedName(&apiVarName);
 		return true;