Skip to content
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

Fixed infinite loop when parsing dotnet TypeRef table #2045

Closed
wants to merge 1 commit into from
Closed

Fixed infinite loop when parsing dotnet TypeRef table #2045

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
4 changes: 3 additions & 1 deletion capa/features/extractors/dnfile/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,7 @@ def resolve_nested_typeref_name(
# If the ResolutionScope decodes to a typeRef type then it is nested
if isinstance(typeref.ResolutionScope.table, dnfile.mdtable.TypeRef):
typeref_name = []
typeref_tb = []
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what _tb means, please add a comment or consider updating the name to something more obvious like _visited.

name = typeref.TypeName
# Not appending the current typeref name to avoid potential duplicate

Expand All @@ -380,10 +381,11 @@ def resolve_nested_typeref_name(

while isinstance(table_row.ResolutionScope.table, dnfile.mdtable.TypeRef):
# Iterate through the typeref table to resolve the nested name
typeref_tb.append(table_row)
typeref_name.append(name)
name = table_row.TypeName
table_row = get_dotnet_table_row(pe, dnfile.mdtable.TypeRef.number, table_row.ResolutionScope.row_index)
if table_row is None:
if table_row is None or table_row in typeref_tb:
Copy link
Collaborator

@mike-hunhoff mike-hunhoff Apr 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use similar logic in resolve_nested_typedef_name. What are your thoughts on also adding this check there?

return typeref.TypeNamespace, tuple(typeref_name[::-1])

# Document the root enclosing details
Expand Down
Loading