Commit491e134

committed

Fix Improper Import Order Breakingfuzz_submodule Fuzzer

ClusterFuzz runs of the `fuzz_submodule` target have been failingbecause the `git` import was placed before the condition that sets theGit executable path.The order in which `git` is imported matters because it attempts to finda Git executable as the import is loaded (via `refresh()` in`git/__init__.py`.) As per#1909, we configure the ClusterFuzzenvironment to use a bundled Git executable via the env variablecondition in all fuzz targets.

1 parente51bfdf commit491e134Copy full SHA for 491e134

File tree

1 file changed

-1

lines changed

fuzzing/fuzz-targets
- fuzz_submodule.py

1 file changed

-1

lines changed

`‎fuzzing/fuzz-targets/fuzz_submodule.py`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,13 @@`
`4`	`4`	`importtempfile`
`5`	`5`	`fromconfigparserimportParsingError`
`6`	`6`	`fromutilsimportis_expected_exception_message,get_max_filename_length`
`7`		`-fromgitimportRepo,GitCommandError,InvalidGitRepositoryError`
`8`	`7`
`9`	`8`	`ifgetattr(sys,"frozen",False)andhasattr(sys,"_MEIPASS"):# pragma: no cover`
`10`	`9`	`path_to_bundled_git_binary=os.path.abspath(os.path.join(os.path.dirname(__file__),"git"))`
`11`	`10`	`os.environ["GIT_PYTHON_GIT_EXECUTABLE"]=path_to_bundled_git_binary`
`12`	`11`
	`12`	`+fromgitimportRepo,GitCommandError,InvalidGitRepositoryError`
	`13`	`+`
`13`	`14`	`ifnotsys.warnoptions:# pragma: no cover`
`14`	`15`	`# The warnings filter below can be overridden by passing the -W option`
`15`	`16`	# to the Python interpreter command line or setting the `PYTHONWARNINGS` environment variable.

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit491e134

File tree

1 file changed

1 file changed

`‎fuzzing/fuzz-targets/fuzz_submodule.py`

0 commit comments