| Alphare |
| hg-reviewers |
If pycompat.unnamedtempfile() raises an exception, it would have called
stdin.close() in the finally block without it being initialized first.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/utils/procutil.py (9 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 |
| if record_wait is None: | if record_wait is None: | ||||
| # double-fork to completely detach from the parent process | # double-fork to completely detach from the parent process | ||||
| script = b'( %s ) &' % script | script = b'( %s ) &' % script | ||||
| start_new_session = True | start_new_session = True | ||||
| else: | else: | ||||
| start_new_session = False | start_new_session = False | ||||
| ensurestart = True | ensurestart = True | ||||
| stdin = None | |||||
| try: | try: | ||||
| if stdin_bytes is None: | if stdin_bytes is None: | ||||
| stdin = subprocess.DEVNULL | stdin = subprocess.DEVNULL | ||||
| else: | else: | ||||
| stdin = pycompat.unnamedtempfile() | stdin = pycompat.unnamedtempfile() | ||||
| stdin.write(stdin_bytes) | stdin.write(stdin_bytes) | ||||
| stdin.flush() | stdin.flush() | ||||
| stdin.seek(0) | stdin.seek(0) | ||||
| stderr=stderr, | stderr=stderr, | ||||
| start_new_session=start_new_session, | start_new_session=start_new_session, | ||||
| ) | ) | ||||
| except Exception: | except Exception: | ||||
| if record_wait is not None: | if record_wait is not None: | ||||
| record_wait(255) | record_wait(255) | ||||
| raise | raise | ||||
| finally: | finally: | ||||
| if stdin_bytes is not None: | if stdin_bytes is not None and stdin is not None: | ||||
| assert not isinstance(stdin, int) | assert not isinstance(stdin, int) | ||||
| stdin.close() | stdin.close() | ||||
| if not ensurestart: | if not ensurestart: | ||||
| # Even though we're not waiting on the child process, | # Even though we're not waiting on the child process, | ||||
| # we still must call waitpid() on it at some point so | # we still must call waitpid() on it at some point so | ||||
| # it's not a zombie/defunct. This is especially relevant for | # it's not a zombie/defunct. This is especially relevant for | ||||
| # chg since the parent process won't die anytime soon. | # chg since the parent process won't die anytime soon. | ||||
| # We use a thread to make the overhead tiny. | # We use a thread to make the overhead tiny. | ||||
| raise OSError( | raise OSError( | ||||
| returncode, | returncode, | ||||
| b'error running %r: %s' | b'error running %r: %s' | ||||
| % (cmd, os.strerror(returncode)), | % (cmd, os.strerror(returncode)), | ||||
| ) | ) | ||||
| return | return | ||||
| returncode = 255 | returncode = 255 | ||||
| stdin = None | |||||
| try: | try: | ||||
| if record_wait is None: | if record_wait is None: | ||||
| # Start a new session | # Start a new session | ||||
| os.setsid() | os.setsid() | ||||
| # connect stdin to devnull to make sure the subprocess can't | # connect stdin to devnull to make sure the subprocess can't | ||||
| # muck up that stream for mercurial. | # muck up that stream for mercurial. | ||||
| if stdin_bytes is None: | if stdin_bytes is None: | ||||
| stdin = open(os.devnull, b'r') | stdin = open(os.devnull, b'r') | ||||
| # This shouldn't happen, but just in case make sure the | # This shouldn't happen, but just in case make sure the | ||||
| # return code is never 0 here. | # return code is never 0 here. | ||||
| returncode = 255 | returncode = 255 | ||||
| except Exception: | except Exception: | ||||
| returncode = 255 | returncode = 255 | ||||
| finally: | finally: | ||||
| # mission accomplished, this child needs to exit and not | # mission accomplished, this child needs to exit and not | ||||
| # continue the hg process here. | # continue the hg process here. | ||||
| if stdin is not None: | |||||
| stdin.close() | stdin.close() | ||||
| if record_wait is None: | if record_wait is None: | ||||
| os._exit(returncode) | os._exit(returncode) | ||||
| if pycompat.ispy3: | if pycompat.ispy3: | ||||
| # This branch is more robust, because it avoids running python | # This branch is more robust, because it avoids running python | ||||
| # code (hence gc finalizers, like sshpeer.__del__, which | # code (hence gc finalizers, like sshpeer.__del__, which | ||||
| # blocks). But we can't easily do the equivalent in py2, | # blocks). But we can't easily do the equivalent in py2, | ||||
| # because of the lack of start_new_session=True flag. Given | # because of the lack of start_new_session=True flag. Given | ||||
| # that the py2 branch should die soon, the short-lived | # that the py2 branch should die soon, the short-lived | ||||
| # duplication seems acceptable. | # duplication seems acceptable. | ||||
| runbgcommand = runbgcommandpy3 | runbgcommand = runbgcommandpy3 | ||||
| else: | else: | ||||
| runbgcommand = runbgcommandpy2 | runbgcommand = runbgcommandpy2 | ||||