aboutsummaryrefslogtreecommitdiff
path: root/fuzzers
diff options
context:
space:
mode:
authorCalder Kitagawa <ckitagawa@chromium.org>2018-05-24 18:37:44 +0000
committerEdward Lesmes <ehmaldonado@google.com>2021-07-23 22:38:16 +0000
commitbab7823ce6343d0267271c0cfbc5f6fbceeafe3e (patch)
tree3b25973616397aeb69cf08980ae247141c07baea /fuzzers
parent0d7a2511be3754c2e4860e16ddbf7610e07ffe68 (diff)
downloadzucchini-bab7823ce6343d0267271c0cfbc5f6fbceeafe3e.tar.gz
[Zucchini] Fix ToTWinCFI
This is an attempted fix for ToTWinCFI. Looks like sys.executable logic isn't working well on some Python configurations so directly using sys.executable. If this doesn't fix ToTCFI I'll revert the previous change until I can determine what is happening: https://chromium.googlesource.com/chromium/src/+/8e7c08d3d11c61d08ad05d3ebc283aa2d6bf7c91 Thanks to thakis@ for solution suggestion. Bug: 844826 Change-Id: Ie1cb36fe19401e954cb84bc905cd95c9eefa1622 Reviewed-on: https://chromium-review.googlesource.com/1072159 Commit-Queue: Calder Kitagawa <ckitagawa@chromium.org> Reviewed-by: Samuel Huang <huangs@chromium.org> Cr-Commit-Position: refs/heads/master@{#561567} NOKEYCHECK=True GitOrigin-RevId: ee3c0b0a933b9d9466620186bfeff8f62ea0af5f
Diffstat (limited to 'fuzzers')
-rwxr-xr-xfuzzers/generate_fuzzer_data.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/fuzzers/generate_fuzzer_data.py b/fuzzers/generate_fuzzer_data.py
index 55e1edc..c182baf 100755
--- a/fuzzers/generate_fuzzer_data.py
+++ b/fuzzers/generate_fuzzer_data.py
@@ -42,13 +42,7 @@ def gen(old_file, new_file, patch_file, output_dir, is_raw, is_win):
# Handle Windows executable names.
zucchini = 'zucchini'
protoc = 'protoc'
- # NOTE: Windows can't find Python via #! so we have to help it.
- python = sys.executable
- if not python:
- python = 'python'
if is_win:
- if not python.lower().endswith('.exe'):
- python += '.exe'
zucchini += '.exe'
protoc += '.exe'
@@ -64,7 +58,7 @@ def gen(old_file, new_file, patch_file, output_dir, is_raw, is_win):
new_file))
return ret
# Binary encode the protobuf pair.
- ret = subprocess.call([python,
+ ret = subprocess.call([sys.executable,
os.path.join(ABS_PATH, 'create_seed_file_pair.py'),
os.path.abspath(protoc), old_file, patch_file,
os.path.join(output_dir, 'seed_proto.bin')],