core: enable loading light C calltrees (#1894)

* core: enable loading light C calltrees

Signed-off-by: David Korczynski <[email protected]>

* nit

Signed-off-by: David Korczynski <[email protected]>

---------

Signed-off-by: David Korczynski <[email protected]>

Author: DavidKorczynski

src/fuzz_introspector/data_loader.py

@@ -55,7 +55,15 @@ def read_fuzzer_data_file_to_profile(
 
     # Must be  dictionary
     if data_dict_yaml is None or not isinstance(data_dict_yaml, dict):
-        return None
+        logger.info('Found no data yaml file')
+        if os.path.isfile('report.yaml'):
+            data_dict_yaml = utils.data_file_read_yaml('report.yaml')
+            if data_dict_yaml is None or not isinstance(data_dict_yaml, dict):
+                logger.info('Report.yaml is not a valid yaml file')
+                return None
+        else:
+            logger.info('Found no module yaml files')
+            return None
 
     profile = fuzzer_profile.FuzzerProfile(cfg_file, data_dict_yaml, language)
 
@@ -123,6 +131,9 @@ def load_all_profiles(
     profiles = []
     data_files = utils.get_all_files_in_tree_with_regex(
         target_folder, "fuzzerLogFile.*\.data$")
+    data_files.extend(
+        utils.get_all_files_in_tree_with_regex(target_folder,
+                                               "fuzzer-calltree-*"))
     target_calltrees = utils.get_all_files_in_tree_with_regex(
         target_folder, "targetCalltree.txt$")
     logger.info(target_calltrees)

src/fuzz_introspector/frontends/frontend_c.py

@@ -346,8 +346,10 @@ def function_signature(self):
             if child.is_named:
                 if self.root.field_name_for_child(child_idx) == 'body':
                     break
-            function_signature += child.text.decode() + ' '
-
+            try:
+                function_signature += child.text.decode() + ' '
+            except UnicodeDecodeError:
+                pass
         function_signature = function_signature.replace('\n',
                                                         '').replace('\\n', '')
         while '  ' in function_signature:

src/fuzz_introspector/frontends/oss_fuzz.py

@@ -87,7 +87,9 @@ def process_c_project(target_dir, entrypoint, out):
             with open(os.path.join(out, 'fuzzer-calltree-%d' % (idx)),
                       'w',
                       encoding='utf-8') as f:
+                f.write("Call tree\n")
                 f.write(harness_dict['calltree'])
+                f.write("====================================")
 
 
 def process_cpp_project(target_dir, entrypoint, out):