# HG changeset patch # User Matt Harbison # Date 2021-12-14 22:29:30 # Node ID f8540fe4be0f12a9e9118523b5f263fa12ab92a8 # Parent 333a2656e98143dd2e258deb7a66f0b978f8c09b procutil: avoid an uninitialized variable usage on tempfile exception If `pycompat.unnamedtempfile()` raises an exception, it would have called `stdin.close()` in the `finally` block without it being initialized first. Differential Revision: https://phab.mercurial-scm.org/D11928 diff --git a/mercurial/utils/procutil.py b/mercurial/utils/procutil.py --- a/mercurial/utils/procutil.py +++ b/mercurial/utils/procutil.py @@ -742,6 +742,8 @@ else: start_new_session = False ensurestart = True + stdin = None + try: if stdin_bytes is None: stdin = subprocess.DEVNULL @@ -770,7 +772,7 @@ else: record_wait(255) raise finally: - if stdin_bytes is not None: + if stdin_bytes is not None and stdin is not None: assert not isinstance(stdin, int) stdin.close() if not ensurestart: @@ -852,6 +854,8 @@ else: return returncode = 255 + stdin = None + try: if record_wait is None: # Start a new session @@ -894,7 +898,8 @@ else: finally: # mission accomplished, this child needs to exit and not # continue the hg process here. - stdin.close() + if stdin is not None: + stdin.close() if record_wait is None: os._exit(returncode)