[Python-checkins] cpython (merge 3.2 -> default): Merge 3.2.
stefan.krah
python-checkins at python.org
Mon Aug 20 14:48:54 CEST 2012
http://hg.python.org/cpython/rev/5b1b9cfb7fe8
changeset: 78671:5b1b9cfb7fe8
parent: 78669:c89fe7dc22ee
parent: 78670:03c98d05b140
user: Stefan Krah <skrah at bytereef.org>
date: Mon Aug 20 14:42:59 2012 +0200
summary:
Merge 3.2.
files:
Lib/test/test_capi.py | 10 ++++++++++
Modules/_posixsubprocess.c | 2 ++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -91,6 +91,16 @@
self.assertRaises(TypeError, _posixsubprocess.fork_exec,
1,Z(),3,[1, 2],5,6,7,8,9,10,11,12,13,14,15,16,17)
+ @unittest.skipUnless(_posixsubprocess, '_posixsubprocess required for this test.')
+ def test_subprocess_fork_exec(self):
+ class Z(object):
+ def __len__(self):
+ return 1
+
+ # Issue #15738: crash in subprocess_fork_exec()
+ self.assertRaises(TypeError, _posixsubprocess.fork_exec,
+ Z(),[b'1'],3,[1, 2],5,6,7,8,9,10,11,12,13,14,15,16,17)
+
@unittest.skipUnless(threading, 'Threading required for this test.')
class TestPendingCalls(unittest.TestCase):
diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
--- a/Modules/_posixsubprocess.c
+++ b/Modules/_posixsubprocess.c
@@ -579,6 +579,8 @@
/* Equivalent to: */
/* tuple(PyUnicode_FSConverter(arg) for arg in process_args) */
fast_args = PySequence_Fast(process_args, "argv must be a tuple");
+ if (fast_args == NULL)
+ goto cleanup;
num_args = PySequence_Fast_GET_SIZE(fast_args);
converted_args = PyTuple_New(num_args);
if (converted_args == NULL)
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list