diff options
| author | Anthony Shaw <anthony.p.shaw@gmail.com> | 2019-05-10 12:00:06 +1000 |
|---|---|---|
| committer | Victor Stinner <vstinner@redhat.com> | 2019-05-10 04:00:06 +0200 |
| commit | 948ed8c96b6912541a608591efe3e00fb520429a (patch) | |
| tree | f425a515663321d16ded48c9cedf94ddf5ca371f | |
| parent | fce5ff1e18b522cf52379934a6560583d840e7f9 (diff) | |
| download | cpython-git-948ed8c96b6912541a608591efe3e00fb520429a.tar.gz | |
bpo-36814: ensure os.posix_spawn() handles None (GH-13144)
Fix an issue where os.posix_spawn() would incorrectly raise a TypeError
when file_actions is None.
| -rw-r--r-- | Lib/test/test_posix.py | 9 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2019-05-06-23-13-26.bpo-36814.dSeMz_.rst | 1 | ||||
| -rw-r--r-- | Modules/posixmodule.c | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py index 843402930f..5c93d0d507 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -1550,6 +1550,15 @@ class _PosixSpawnMixin: with open(envfile) as f: self.assertEqual(f.read(), 'bar') + def test_none_file_actions(self): + pid = self.spawn_func( + self.NOOP_PROGRAM[0], + self.NOOP_PROGRAM, + os.environ, + file_actions=None + ) + self.assertEqual(os.waitpid(pid, 0), (pid, 0)) + def test_empty_file_actions(self): pid = self.spawn_func( self.NOOP_PROGRAM[0], diff --git a/Misc/NEWS.d/next/Library/2019-05-06-23-13-26.bpo-36814.dSeMz_.rst b/Misc/NEWS.d/next/Library/2019-05-06-23-13-26.bpo-36814.dSeMz_.rst new file mode 100644 index 0000000000..3f40011b26 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-05-06-23-13-26.bpo-36814.dSeMz_.rst @@ -0,0 +1 @@ +Fix an issue where os.posix_spawnp() would incorrectly raise a TypeError when file_actions is None.
\ No newline at end of file diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 221f7101b2..aa77094da0 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -5465,7 +5465,7 @@ py_posix_spawn(int use_posix_spawnp, PyObject *module, path_t *path, PyObject *a goto exit; } - if (file_actions != NULL) { + if (file_actions != NULL && file_actions != Py_None) { /* There is a bug in old versions of glibc that makes some of the * helper functions for manipulating file actions not copy the provided * buffers. The problem is that posix_spawn_file_actions_addopen does not |