Commit797009d

authored

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

Attempt 2 - Fix Missing Git Executable Causing ClusterFuzz Crash

2 parents82bb3bb +dac3535 commit797009dCopy full SHA for 797009d

File tree

-8

lines changed

-8

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,15 @@`
`23`	`23`	`importos`
`24`	`24`	`fromconfigparserimportMissingSectionHeaderError,ParsingError`
`25`	`25`
	`26`	`+ifgetattr(sys,"frozen",False)andhasattr(sys,"_MEIPASS"):`
	`27`	`+path_to_bundled_git_binary=os.path.abspath(os.path.join(os.path.dirname(__file__),"git"))`
	`28`	`+os.environ["GIT_PYTHON_GIT_EXECUTABLE"]=path_to_bundled_git_binary`
	`29`	`+`
`26`	`30`	`withatheris.instrument_imports():`
`27`	`31`	`importgit`
`28`	`32`
`29`	`33`
`30`	`34`	`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`		`-`
`35`	`35`	`sio=io.BytesIO(data)`
`36`	`36`	`sio.name="/tmp/fuzzconfig.config"`
`37`	`37`	`git_config=git.GitConfigParser(sio)`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,15 @@`
`23`	`23`	`importos`
`24`	`24`	`importshutil`
`25`	`25`
	`26`	`+ifgetattr(sys,"frozen",False)andhasattr(sys,"_MEIPASS"):`
	`27`	`+path_to_bundled_git_binary=os.path.abspath(os.path.join(os.path.dirname(__file__),"git"))`
	`28`	`+os.environ["GIT_PYTHON_GIT_EXECUTABLE"]=path_to_bundled_git_binary`
	`29`	`+`
`26`	`30`	`withatheris.instrument_imports():`
`27`	`31`	`importgit`
`28`	`32`
`29`	`33`
`30`	`34`	`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`		`-`
`35`	`35`	`fdp=atheris.FuzzedDataProvider(data)`
`36`	`36`	`git_dir="/tmp/.git"`
`37`	`37`	`head_file=os.path.join(git_dir,"HEAD")`

Comments

(0)