Commitf6174e7

committed

Fix IndexError in GitConfigParser when config value ends in new line

Improve the guarding `if` check in `GitConfigParser`'s `string_decode`function to safely handle empty strings and prevent `IndexError`s whenaccessing string elements.This resolves an IndexError in the `GitConfigParser`'s `.read()`method when the config file contains a quoted value containing atrailing new line.Fixes:#1887

1 parentbc7bd22 commitf6174e7Copy full SHA for f6174e7

File tree

3 files changed

+10

-6

lines changed

fuzzing/fuzz-targets
- fuzz_config.py
git
- config.py
test
- test_config.py

3 files changed

+10

-6

lines changed

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

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,7 @@ def TestOneInput(data):`
`35`	`35`	`except (MissingSectionHeaderError,ParsingError,UnicodeDecodeError):`
`36`	`36`	`return-1# Reject inputs raising expected exceptions`
`37`	`37`	`except (IndexError,ValueError)ase:`
`38`		`-ifisinstance(e,IndexError)and"string index out of range"instr(e):`
`39`		`-# Known possibility that might be patched`
`40`		`-# See: https://github.com/gitpython-developers/GitPython/issues/1887`
`41`		`-pass`
`42`		`-elifisinstance(e,ValueError)and"embedded null byte"instr(e):`
	`38`	`+ifisinstance(e,ValueError)and"embedded null byte"instr(e):`
`43`	`39`	# The `os.path.expanduser` function, which does not accept strings
`44`	`40`	`# containing null bytes might raise this.`
`45`	`41`	`return-1`

`‎git/config.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -452,7 +452,7 @@ def _read(self, fp: Union[BufferedReader, IO[bytes]], fpname: str) -> None:`
`452`	`452`	`e=None# None, or an exception.`
`453`	`453`
`454`	`454`	`defstring_decode(v:str)->str:`
`455`		`-ifv[-1]=="\\":`
	`455`	`+ifvandv[-1]=="\\":`
`456`	`456`	`v=v[:-1]`
`457`	`457`	`# END cut trailing escapes to prevent decode error`
`458`	`458`

`‎test/test_config.py‎`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,14 @@ def test_multi_line_config(self):`
`142`	`142`	`)`
`143`	`143`	`self.assertEqual(len(config.sections()),23)`
`144`	`144`
	`145`	`+deftest_config_value_with_trailing_new_line(self):`
	`146`	`+config_content=b'[section-header]\nkey:"value\n"'`
	`147`	`+config_file=io.BytesIO(config_content)`
	`148`	`+config_file.name="multiline_value.config"`
	`149`	`+`
	`150`	`+git_config=GitConfigParser(config_file)`
	`151`	`+git_config.read()# This should not throw an exception`
	`152`	`+`
`145`	`153`	`deftest_base(self):`
`146`	`154`	`path_repo=fixture_path("git_config")`
`147`	`155`	`path_global=fixture_path("git_config_global")`

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!

Commitf6174e7

File tree

3 files changed

3 files changed

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

`‎git/config.py‎`

`‎test/test_config.py‎`

0 commit comments