diff --git a/libs/fuzzlib/fuzzer_helper.py b/libs/fuzzlib/fuzzer_helper.py index b7d4ee7cf210e3201d507147ec0d150e07f87b9b..7bfb2f48ec7591ec25a833f8cd2381ddc825d9a9 100644 --- a/libs/fuzzlib/fuzzer_helper.py +++ b/libs/fuzzlib/fuzzer_helper.py @@ -132,7 +132,7 @@ def generate(args): with open(file_path, 'w') as filehandle: filehandle.write(PROJECT_XML_TEMPLATE % template_args) - file_path = os.path.join(project_dir_path, "%s.cc" % args.project_name) + file_path = os.path.join(project_dir_path, "%s.cpp" % args.project_name) with open(file_path, 'w') as filehandle: filehandle.write(PROJECT_DEMO_TEMPLATE % template_args) @@ -162,7 +162,6 @@ def make(args, stdout=None): './build.sh', '--gn-args', 'build_example=true', - '--target-variant sanitizer', '--build-target' ] build_script.append(args.project_name) diff --git a/libs/fuzzlib/tools/templates.py b/libs/fuzzlib/tools/templates.py index 936183a4574152b5ced90b28243d3c832cd916eb..deb56751d199e0da19607b1ff60173fc8ffe6c49 100644 --- a/libs/fuzzlib/tools/templates.py +++ b/libs/fuzzlib/tools/templates.py @@ -94,11 +94,11 @@ PROJECT_DEMO_TEMPLATE = """\ #include #include -const int FUZZ_DATA_LEN = 3 -const int FUZZ_FST_DATA = 0 -const int FUZZ_SND_DATA = 1 -const int FUZZ_TRD_DATA = 2 -const int FUZZ_FTH_DATA = 3 +const int FUZZ_DATA_LEN = 3; +const int FUZZ_FST_DATA = 0; +const int FUZZ_SND_DATA = 1; +const int FUZZ_TRD_DATA = 2; +const int FUZZ_FTH_DATA = 3; namespace OHOS { bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) diff --git a/src/core/utils.py b/src/core/utils.py index 752781b33cc4cffdac85511a7882785fdd96836c..02f086f45908d00b5efb07e4b0c25c516e14ea86 100755 --- a/src/core/utils.py +++ b/src/core/utils.py @@ -18,6 +18,7 @@ import sys import os +import platform import time from core.config.config_manager import UserConfigManager @@ -156,13 +157,17 @@ def get_decode(stream): def parse_fuzzer_info(): path_list = [] bin_list = [] - list_path = os.path.join(sys.source_code_root_path, "test", - "developertest", "libs", "fuzzlib", "fuzzer_list.txt") + list_path = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname( + os.path.realpath(__file__)))), "libs", "fuzzlib", "fuzzer_list.txt") with open(list_path, 'r') as list_file: for line in list_file.readlines(): striped_str = line.strip() - path_list.append(striped_str.split(":")[0][3:]) - bin_list.append(striped_str.split(":")[1].split("(")[0]) + if platform.system() == "Windows": + path_list.append(striped_str.split(" ")[0]) + bin_list.append(striped_str.split(" ")[1]) + else: + path_list.append(striped_str.split(":")[0][3:]) + bin_list.append(striped_str.split(":")[1].split("(")[0]) return path_list, bin_list def get_fuzzer_path(filename):