Skip to content

Fixes binaryninja-api#6825 #6916

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

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fixes binaryninja-api#6825 #6916

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
129 changes: 61 additions & 68 deletions lang/c/pseudoc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2464,92 +2464,85 @@ void PseudoCFunction::GetExprTextInternal(const HighLevelILInstruction& instr, H
if (type && (type->GetClass() == NamedTypeReferenceClass))
type = GetFunction()->GetView()->GetTypeByRef(type->GetNamedTypeReference());

bool derefOffset = false;
bool memberResolved = false;
if (type && (type->GetClass() == StructureTypeClass))
{
std::optional<size_t> memberIndexHint;
if (memberIndex != BN_INVALID_EXPR)
memberIndexHint = memberIndex;

bool outer = true;
if (type->GetStructure()->ResolveMemberOrBaseMember(GetFunction()->GetView(), offset, 0,
[&](NamedTypeReference*, Structure* s, size_t memberIndex, uint64_t structOffset,
uint64_t adjustedOffset, const StructureMember& member) {
BNSymbolDisplayResult symbolType;
if (srcExpr.operation == HLIL_CONST_PTR)
{
const auto constant = srcExpr.GetConstant<HLIL_CONST_PTR>();
symbolType = tokens.AppendPointerTextToken(
srcExpr, constant, settings, DisplaySymbolOnly, precedence);
}
else
{
GetExprTextInternal(srcExpr, tokens, settings, MemberAndFunctionOperatorPrecedence);
symbolType = OtherSymbolResult;
}

const auto displayDeref = symbolType != DataSymbolResult;
if (displayDeref && outer)
tokens.Append(OperationToken, "->");
else
tokens.Append(OperationToken, ".");
outer = false;

vector<string> nameList {member.name};
HighLevelILTokenEmitter::AddNamesForOuterStructureMembers(
GetFunction()->GetView(), type, srcExpr, nameList);

tokens.Append(FieldNameToken, member.name, structOffset + member.offset, 0, 0,
BN_FULL_CONFIDENCE, nameList);
}),
memberIndexHint)
memberResolved = type->GetStructure()->ResolveMemberOrBaseMember(GetFunction()->GetView(), offset, 0,
[&](NamedTypeReference*, Structure* s, size_t memberIndex, uint64_t structOffset,
uint64_t adjustedOffset, const StructureMember& member) {
BNSymbolDisplayResult symbolType;
if (srcExpr.operation == HLIL_CONST_PTR)
{
const auto constant = srcExpr.GetConstant<HLIL_CONST_PTR>();
symbolType = tokens.AppendPointerTextToken(
srcExpr, constant, settings, DisplaySymbolOnly, precedence);
}
else
{
GetExprTextInternal(srcExpr, tokens, settings, MemberAndFunctionOperatorPrecedence);
symbolType = OtherSymbolResult;
}

const auto displayDeref = symbolType != DataSymbolResult;
if (displayDeref && outer)
tokens.Append(OperationToken, "->");
else
tokens.Append(OperationToken, ".");
outer = false;

vector<string> nameList {member.name};
HighLevelILTokenEmitter::AddNamesForOuterStructureMembers(
GetFunction()->GetView(), type, srcExpr, nameList);

tokens.Append(FieldNameToken, member.name, structOffset + member.offset, 0, 0,
BN_FULL_CONFIDENCE, nameList);
},
memberIndexHint);

if (memberResolved)
return;
}
else if (type && (type->GetClass() == StructureTypeClass))
{
derefOffset = true;
}

if (derefOffset || offset != 0)
{
bool parens = precedence > UnaryOperatorPrecedence;
if (parens)
tokens.AppendOpenParen();
// Fall through to handle as pointer arithmetic
bool parens = precedence > UnaryOperatorPrecedence;
if (parens)
tokens.AppendOpenParen();

tokens.Append(OperationToken, "*");
if (!settings || settings->IsOptionSet(ShowTypeCasts))
{
tokens.AppendOpenParen();
AppendSizeToken(!derefOffset ? srcExpr.size : instr.size, true, tokens);
tokens.Append(TextToken, "*");
tokens.AppendCloseParen();
}
tokens.Append(OperationToken, "*");
if (!settings || settings->IsOptionSet(ShowTypeCasts))
{
tokens.AppendOpenParen();
if (!settings || settings->IsOptionSet(ShowTypeCasts))
{
tokens.AppendOpenParen();
tokens.Append(TypeNameToken, "char");
tokens.Append(TextToken, "*");
tokens.AppendCloseParen();
}
AppendSizeToken(instr.size, true, tokens);
tokens.Append(TextToken, "*");
tokens.AppendCloseParen();
}
tokens.AppendOpenParen();

if (srcExpr.operation == HLIL_CONST_PTR)
{
const auto constant = srcExpr.GetConstant<HLIL_CONST_PTR>();
tokens.AppendPointerTextToken(srcExpr, constant, settings, DisplaySymbolOnly, precedence);
}
else
{
GetExprTextInternal(srcExpr, tokens, settings, AddOperatorPrecedence);
}
if (srcExpr.operation == HLIL_CONST_PTR)
{
const auto constant = srcExpr.GetConstant<HLIL_CONST_PTR>();
tokens.AppendPointerTextToken(srcExpr, constant, settings, DisplaySymbolOnly, precedence);
}
else
{
GetExprTextInternal(srcExpr, tokens, settings, AddOperatorPrecedence);
}

if (offset != 0)
{
tokens.Append(OperationToken, " + ");
tokens.AppendIntegerTextToken(instr, offset, instr.size);
tokens.AppendCloseParen();
if (parens)
tokens.AppendCloseParen();
}

tokens.AppendCloseParen();
if (parens)
tokens.AppendCloseParen();

if (statement)
tokens.AppendSemicolon();
}();
Expand Down