Skip to content

Add MSVC demangler correctness fixes and generated test corpus #8140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
plafosse wants to merge 4 commits into from
Closed

Add MSVC demangler correctness fixes and generated test corpus #8140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
524da0e
Refactor MSVC demangler finalization
plafosse Jun 6, 2026
3c09292
Fix GNU3 template and backref handling
plafosse Jun 6, 2026
c553290
Move demangler type nodes out of GNU3
plafosse Jun 10, 2026
13c87ea
Fix demangler no-type result handling
plafosse Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions demangle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -47,8 +46,19 @@ namespace BinaryNinja {
bool DemangleMS(Architecture* arch, const std::string& mangledName, Ref<Type>& outType, QualifiedName& outVarName,
BinaryView* view)
{
const bool simplify = Settings::Instance()->Get<bool>("analysis.types.templateSimplifier", view);
return DemangleMS(arch, mangledName, outType, outVarName, simplify);
BNType* localType = nullptr;
char** localVarName = nullptr;
size_t localSize = 0;
if (!BNDemangleMSWithOptions(arch->GetObject(), mangledName.c_str(), &localType, &localVarName, &localSize,
view ? view->GetObject() : nullptr))
return false;
outType = localType ? new Type(localType) : nullptr;
for (size_t i = 0; i < localSize; i++)
{
outVarName.push_back(localVarName[i]);
}
BNFreeDemangledName(&localVarName, localSize);
return true;
}

bool DemangleMS(Architecture* arch, const std::string& mangledName, Ref<Type>& outType, QualifiedName& outVarName,
Expand Down Expand Up @@ -78,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))
Expand Down Expand Up @@ -231,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;
Expand Down
Loading
Loading