Merge pull request #1909 from DaveLak/attempt-two-fuzzing-fix-missing-git-in-clusterfuzz

Byron · web-flow · commit 797009d796af · 2024-04-27T14:55:24.000+02:00
Attempt 2 - Fix Missing Git Executable Causing ClusterFuzz Crash
diff --git a/fuzzing/fuzz-targets/fuzz_config.py b/fuzzing/fuzz-targets/fuzz_config.py
@@ -23,15 +23,15 @@
 import os
 from configparser import MissingSectionHeaderError, ParsingError
 
+if getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS"):
+ path_to_bundled_git_binary = os.path.abspath(os.path.join(os.path.dirname(__file__), "git"))
+ os.environ["GIT_PYTHON_GIT_EXECUTABLE"] = path_to_bundled_git_binary
+
 with atheris.instrument_imports():
 import git
 
 
 def TestOneInput(data):
- if getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS"):
- path_to_bundled_git_binary = os.path.abspath(os.path.join(os.path.dirname(__file__), "git"))
- git.refresh(path_to_bundled_git_binary)
-
 sio = io.BytesIO(data)
 sio.name = "/tmp/fuzzconfig.config"
 git_config = git.GitConfigParser(sio)
diff --git a/fuzzing/fuzz-targets/fuzz_tree.py b/fuzzing/fuzz-targets/fuzz_tree.py
@@ -23,15 +23,15 @@
 import os
 import shutil
 
+if getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS"):
+ path_to_bundled_git_binary = os.path.abspath(os.path.join(os.path.dirname(__file__), "git"))
+ os.environ["GIT_PYTHON_GIT_EXECUTABLE"] = path_to_bundled_git_binary
+
 with atheris.instrument_imports():
 import git
 
 
 def TestOneInput(data):
- if getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS"):
- path_to_bundled_git_binary = os.path.abspath(os.path.join(os.path.dirname(__file__), "git"))
- git.refresh(path_to_bundled_git_binary)
-
 fdp = atheris.FuzzedDataProvider(data)
 git_dir = "/tmp/.git"
 head_file = os.path.join(git_dir, "HEAD")

-Original file line number
+Diff line change
 importos
 fromconfigparserimportMissingSectionHeaderError, ParsingError
 +ifgetattr(sys, "frozen", False) andhasattr(sys, "_MEIPASS"):
 +path_to_bundled_git_binary=os.path.abspath(os.path.join(os.path.dirname(__file__), "git"))
 +os.environ["GIT_PYTHON_GIT_EXECUTABLE"] =path_to_bundled_git_binary
++
 withatheris.instrument_imports():
 importgit
 defTestOneInput(data):
 -ifgetattr(sys, "frozen", False) andhasattr(sys, "_MEIPASS"):
 -path_to_bundled_git_binary=os.path.abspath(os.path.join(os.path.dirname(__file__), "git"))
 -git.refresh(path_to_bundled_git_binary)
+-
 sio=io.BytesIO(data)
 sio.name="/tmp/fuzzconfig.config"
 git_config=git.GitConfigParser(sio)