Commit82bb3bb

authored

Merge pull request#1908 from DaveLak/fix-issue-1887

Fix `IndexError` in `GitConfigParser` When a Quoted Config Value Contains a Trailing New Line

2 parentsfa2b2d6 +1a0ab5b commit82bb3bbCopy full SHA for 82bb3bb

File tree

+11

-7

lines changed

+11

-7

lines changed

Lines changed: 2 additions & 6 deletions

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

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.endswith("\\"):`
`456`	`456`	`v=v[:-1]`
`457`	`457`	`# END cut trailing escapes to prevent decode error`
`458`	`458`

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")`

Comments

(0)