Restore return type confidence which was lost from the initial refactor

Also commonize some of the demangled string length calculations.

Author: plafosse

demangler/gnu3/demangle_gnu3.cpp

@@ -58,6 +58,15 @@ static inline void rtrim(string &s)
 }
 
 
+static size_t TotalStringSize(const _STD_VECTOR<_STD_STRING>& v)
+{
+	size_t n = 0;
+	for (const auto& s : v)
+		n += s.size();
+	return n;
+}
+
+
 static string GetTemplateString(const vector<string>& args)
 {
 	// Pre-calculate total length to avoid reallocations
@@ -2074,7 +2083,7 @@ DemangledTypeNode DemangleGNU3::DemangleNestedName(bool* allTypeTemplateArgs)
 			newName.reserve(aNames.size() + bNames.size());
 			newName.insert(newName.end(), aNames.begin(), aNames.end());
 			newName.insert(newName.end(), bNames.begin(), bNames.end());
-			if ([&]{ size_t n = 0; for (const auto& s : newName) n += s.size(); return n; }() > MAX_DEMANGLE_LENGTH)
+			if (TotalStringSize(newName) > MAX_DEMANGLE_LENGTH)
 				throw DemangleException("Detected adversarial mangled string");
 			type.SetNTR(type.GetNTRClass(), newName);
 			type.SetHasTemplateArguments(false);
@@ -2174,7 +2183,7 @@ DemangledTypeNode DemangleGNU3::DemangleLocalName()
 		newName.reserve(aNames.size() + bNames.size());
 		newName.insert(newName.end(), aNames.begin(), aNames.end());
 		newName.insert(newName.end(), bNames.begin(), bNames.end());
-		if ([&]{ size_t n = 0; for (const auto& s : newName) n += s.size(); return n; }() > MAX_DEMANGLE_LENGTH)
+		if (TotalStringSize(newName) > MAX_DEMANGLE_LENGTH)
 			throw DemangleException("Detected adversarial mangled string");
 		type.SetTypeName(std::move(newName));
 		type.SetConst(tmpType.IsConst());
@@ -2791,6 +2800,8 @@ DemangledTypeNode DemangleGNU3::DemangleSymbol(QualifiedName& varName)
 	m_functionSubstitute.pop_back();
 	m_isParameter = false;
 	type = DemangledTypeNode::FunctionType(std::move(returnType), nullptr, std::move(params));
+	if (isReturnTypeUnknown)
+		type.SetReturnTypeConfidence(BN_MINIMUM_CONFIDENCE);
 
 	type.SetPointerSuffix(suffix);
 	type.SetConst(cnst);

demangler/gnu3/demangled_type_node.cpp

@@ -29,7 +29,8 @@ DemangledTypeNode::DemangledTypeNode()
 	  m_const(false), m_volatile(false), m_signed(false),
 	  m_hasTemplateArgs(false), m_nameType(NoNameType),
 	  m_ntrClass(UnknownNamedTypeClass),
-	  m_pointerReference(PointerReferenceType), m_elements(0)
+	  m_pointerReference(PointerReferenceType), m_elements(0),
+	  m_returnTypeConfidence(BN_DEFAULT_CONFIDENCE)
 {
 }
 
@@ -503,7 +504,7 @@ Ref<Type> DemangledTypeNode::Finalize() const
 			Ref<Type> pType = p.type ? p.type->Finalize() : Ref<Type>(Type::VoidType());
 			finalParams.push_back({p.name, pType, true, Variable()});
 		}
-		TypeBuilder tb = TypeBuilder::FunctionType(retType, nullptr, finalParams);
+		TypeBuilder tb = TypeBuilder::FunctionType(retType->WithConfidence(m_returnTypeConfidence), nullptr, finalParams);
 		tb.SetConst(m_const);
 		tb.SetVolatile(m_volatile);
 		for (auto ps : m_pointerSuffix)

demangler/gnu3/demangled_type_node.h

@@ -123,6 +123,7 @@ class DemangledTypeNode
 	void SetHasTemplateArguments(bool t) { m_hasTemplateArgs = t; }
 	void SetPointerSuffix(const _STD_SET<BNPointerSuffix>& s) { m_pointerSuffix = s; }
 	void AddPointerSuffix(BNPointerSuffix ps) { m_pointerSuffix.insert(ps); }
+	void SetReturnTypeConfidence(uint8_t c) { m_returnTypeConfidence = c; }
 
 	// Named type reference operations
 	void SetNTR(BNNamedTypeReferenceClass cls, _STD_VECTOR<_STD_STRING> nameSegments);
@@ -160,6 +161,7 @@ class DemangledTypeNode
 
 	// Function params
 	_STD_VECTOR<Param> m_params;
+	uint8_t m_returnTypeConfidence;
 
 	// Helpers for string formatting
 	_STD_STRING GetModifierString() const;