Commit0552b83

authored

Merge pull request#1906 from DaveLak/fuzzing-fix-missing-git-in-clusterfuzz

Fix Fuzzer Crash in ClusterFuzz Due to Missing Git Executable

2 parentsbc7bd22 +f4b95cf commit0552b83Copy full SHA for 0552b83

File tree

+15

-7

lines changed

+15

-7

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,16 +20,21 @@`
`20`	`20`	`importatheris`
`21`	`21`	`importsys`
`22`	`22`	`importio`
	`23`	`+importos`
`23`	`24`	`fromconfigparserimportMissingSectionHeaderError,ParsingError`
`24`	`25`
`25`	`26`	`withatheris.instrument_imports():`
`26`		`-fromgitimportGitConfigParser`
	`27`	`+importgit`
`27`	`28`
`28`	`29`
`29`	`30`	`defTestOneInput(data):`
	`31`	`+ifgetattr(sys,"frozen",False)andhasattr(sys,"_MEIPASS"):`
	`32`	`+path_to_bundled_git_binary=os.path.abspath(os.path.join(os.path.dirname(__file__),"git"))`
	`33`	`+git.refresh(path_to_bundled_git_binary)`
	`34`	`+`
`30`	`35`	`sio=io.BytesIO(data)`
`31`	`36`	`sio.name="/tmp/fuzzconfig.config"`
`32`		`-git_config=GitConfigParser(sio)`
	`37`	`+git_config=git.GitConfigParser(sio)`
`33`	`38`	`try:`
`34`	`39`	`git_config.read()`
`35`	`40`	`except (MissingSectionHeaderError,ParsingError,UnicodeDecodeError):`

Lines changed: 7 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,14 @@`
`24`	`24`	`importshutil`
`25`	`25`
`26`	`26`	`withatheris.instrument_imports():`
`27`		`-fromgit.objectsimportTree`
`28`		`-fromgit.repoimportRepo`
	`27`	`+importgit`
`29`	`28`
`30`	`29`
`31`	`30`	`defTestOneInput(data):`
	`31`	`+ifgetattr(sys,"frozen",False)andhasattr(sys,"_MEIPASS"):`
	`32`	`+path_to_bundled_git_binary=os.path.abspath(os.path.join(os.path.dirname(__file__),"git"))`
	`33`	`+git.refresh(path_to_bundled_git_binary)`
	`34`	`+`
`32`	`35`	`fdp=atheris.FuzzedDataProvider(data)`
`33`	`36`	`git_dir="/tmp/.git"`
`34`	`37`	`head_file=os.path.join(git_dir,"HEAD")`
`@@ -46,9 +49,9 @@ def TestOneInput(data):`
`46`	`49`	`os.mkdir(common_dir)`
`47`	`50`	`os.mkdir(objects_dir)`
`48`	`51`
`49`		`-_repo=Repo("/tmp/")`
	`52`	`+_repo=git.Repo("/tmp/")`
`50`	`53`
`51`		`-fuzz_tree=Tree(_repo,Tree.NULL_BIN_SHA,0,"")`
	`54`	`+fuzz_tree=git.Tree(_repo,git.Tree.NULL_BIN_SHA,0,"")`
`52`	`55`	`try:`
`53`	`56`	`fuzz_tree._deserialize(io.BytesIO(data))`
`54`	`57`	`exceptIndexError:`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ find "$SEED_DATA_DIR" \( -name '_seed_corpus.zip' -o -name '.options' -o -name`
`14`	`14`
`15`	`15`	`# Build fuzzers in $OUT.`
`16`	`16`	`find"$SRC/gitpython/fuzzing" -name'fuzz_*.py' -print0\|while IFS=read -r -d'' fuzz_harness;do`
`17`		`- compile_python_fuzzer"$fuzz_harness"`
	`17`	`+ compile_python_fuzzer"$fuzz_harness" --add-binary="$(command -v git):."`
`18`	`18`
`19`	`19`	`common_base_dictionary_filename="$SEED_DATA_DIR/__base.dict"`
`20`	`20`	`if [[-r"$common_base_dictionary_filename" ]];then`

Comments

(0)