Commit2cc8f1e

authored and

Рябченко Иван Константинович

committed

fix(cmd): fixed deadlock when stderr buffer overflow

Fixed deadlock when using stderr=PIPE in Popen and Git generates enoughoutput to a pipe such that it blocks waiting for the OS pipe buffer toaccept more data (seehttps://docs.python.org/2/library/subprocess.html#subprocess.Popen.wait)

1 parent51f79ff commit2cc8f1eCopy full SHA for 2cc8f1e

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -310,11 +310,11 @@ def wait(self):`
`310`	`310`	`"""Wait for the process and return its status code.`
`311`	`311`
`312`	`312`	`:raise GitCommandError: if the return status is not 0"""`
`313`		`-status=self.proc.wait()`
`314`		`-ifstatus!=0:`
`315`		`-raiseGitCommandError(self.args,status,self.proc.stderr.read())`
	`313`	`+stderr_value=self.proc.communicate()[1]`
	`314`	`+ifself.proc.returncode!=0:`
	`315`	`+raiseGitCommandError(self.args,status,stderr_value)`
`316`	`316`	`# END status handling`
`317`		`-returnstatus`
	`317`	`+returnself.proc.returncode`
`318`	`318`	`# END auto interrupt`
`319`	`319`
`320`	`320`	`classCatFileContentStream(object):`

Comments

(0)