From 2a1c0275444bcc1bfd0001e58526530b5138efe4 Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Mon, 1 Mar 2010 17:04:45 +0000 Subject: [PATCH] Merged revisions 78531 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78531 | gregory.p.smith | 2010-02-28 18:31:33 -0800 (Sun, 28 Feb 2010) | 2 lines Fix for r78527. It left out updating forkpty. ........ --- Modules/posixmodule.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 202fae5369..abe6189195 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -3880,15 +3880,18 @@ To both, return fd of newly opened pseudo-terminal.\n"); static PyObject * posix_forkpty(PyObject *self, PyObject *noargs) { - int master_fd = -1, result; + int master_fd = -1, result = 0; pid_t pid; _PyImport_AcquireLock(); pid = forkpty(&master_fd, NULL, NULL, NULL); - if (pid == 0) + if (pid == 0) { + /* child: this clobbers and resets the import lock. */ PyOS_AfterFork(); - - result = _PyImport_ReleaseLock(); + } else { + /* parent: release the import lock. */ + result = _PyImport_ReleaseLock(); + } if (pid == -1) return posix_error(); if (result < 0) { -- 2.50.1