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

core: frontends: frontend_cpp: improve cfg analysis #1974

Merged
merged 1 commit into from
Jan 15, 2025
Merged

core: frontends: frontend_cpp: improve cfg analysis #1974

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
26 changes: 22 additions & 4 deletions src/fuzz_introspector/frontends/frontend_cpp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ def _extract_information(self):
param_list_node = child

# Handle the full name
# Extract the scope that the function is defined in
logger.info('Iterating parents')
tmp_root = self.root
full_name = ''
Expand All @@ -218,11 +219,14 @@ def _extract_information(self):
full_name = new_parent.child_by_field_name(
'name').text.decode() + '::' + full_name
if new_parent.type == 'namespace_definition':
full_name = new_parent.child_by_field_name(
'name').text.decode() + '::' + full_name
# Ignore anonymous namespaces
if new_parent.child_by_field_name('name') is not None:
full_name = new_parent.child_by_field_name(
'name').text.decode() + '::' + full_name
tmp_root = new_parent
logger.debug('Full function scope not from name: %s', full_name)

# Extract the name from the function declarator
tmp_name = ''
tmp_node = self.root.child_by_field_name('declarator')
scope_to_add = ''
Expand All @@ -236,6 +240,9 @@ def _extract_information(self):
if tmp_node.type == 'identifier':
tmp_name = tmp_node.text.decode()
break
if tmp_node.type == 'field_identifier':
tmp_name = tmp_node.text.decode()
break
if tmp_node.child_by_field_name(
'name') is not None and tmp_node.child_by_field_name(
'name').type == 'identifier':
Expand Down Expand Up @@ -456,6 +463,9 @@ def _process_callsites(self, stmt: Node,
var_type = ''
var_type_obj = stmt.child_by_field_name('type')

if var_type_obj is None:
return []

if var_type_obj.type == 'primitive_type' or var_type_obj.type == 'sized_type_specifier':
logger.debug('Skipping.')
return []
Expand All @@ -464,8 +474,11 @@ def _process_callsites(self, stmt: Node,
if var_type_obj is None:
return []
if var_type_obj.type == 'qualified_identifier':
var_type += var_type_obj.child_by_field_name(
'scope').text.decode() + '::'
# logger.debug('qualified idenfitier: %s', var_type_obj.text.decode())
if var_type_obj.child_by_field_name('scope') is not None:
var_type += var_type_obj.child_by_field_name(
'scope').text.decode()
var_type += '::'
var_type_obj = var_type_obj.child_by_field_name('name')

if var_type_obj.type == 'template_type':
Expand Down Expand Up @@ -650,10 +663,12 @@ def extract_calltree(self,
"""Extracts calltree string of a calltree so that FI core can use it."""
# Create calltree from a given function
# Find the function in the source code
logger.debug('Extracting calltree for %s', str(function))
if not visited_functions:
visited_functions = set()

if not function:
logger.debug('No function')
return ''

if not source_code:
Expand All @@ -676,6 +691,7 @@ def extract_calltree(self,
logger.debug('Found no function node')
func_name = function
else:
logger.debug('Could not find function')
return ''

line_to_print = ' ' * depth
Expand All @@ -689,9 +705,11 @@ def extract_calltree(self,
line_to_print += '\n'

if function in visited_functions or not func_node or not source_code:
logger.debug('Function visited or no function node')
return line_to_print

visited_functions.add(function)
logger.debug('Iterating %s callsites', len(func_node.base_callsites))
for cs, line in func_node.base_callsites:
logger.debug('Callsites: %s', cs)
line_to_print += self.extract_calltree(
Expand Down
Loading