Merge pull request #357 from rikdev/autointerrupt_deadlock_fix

Byron · Byron · commit 7e58e6a0d78f · 2015-10-15T08:42:09.000+02:00
fix(cmd): fixed deadlock when stderr buffer overflow
diff --git a/git/cmd.py b/git/cmd.py
@@ -310,11 +310,11 @@ def wait(self):
 """Wait for the process and return its status code.
 
 :raise GitCommandError: if the return status is not 0"""
- status = self.proc.wait()
- if status != 0:
- raise GitCommandError(self.args, status, self.proc.stderr.read())
+ stderr_value = self.proc.communicate()[1]
+ if self.proc.returncode != 0:
+ raise GitCommandError(self.args, status, stderr_value)
 # END status handling
- return status
+ return self.proc.returncode
 # END auto interrupt
 
 class CatFileContentStream(object):

-Original file line number
+Diff line change
 """Wait for the process and return its status code.
  :raise GitCommandError: if the return status is not 0"""
 -status=self.proc.wait()
 -ifstatus!=0:
 -raiseGitCommandError(self.args, status, self.proc.stderr.read())
 +stderr_value=self.proc.communicate()[1]
 +ifself.proc.returncode!=0:
 +raiseGitCommandError(self.args, status, stderr_value)
 # END status handling
 -returnstatus
 +returnself.proc.returncode
 # END auto interrupt
 classCatFileContentStream(object):