summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorStefan Krah <skrah@bytereef.org>2012-08-20 12:42:59 (GMT)
committerStefan Krah <skrah@bytereef.org>2012-08-20 12:42:59 (GMT)
commitc0c03be53e15cd2e724808d83031d939da8fa57b (patch)
treee0be1c9a7d68bbeb96a05099890a8d964db2e0d1 /Modules
parent000fde9651079209d5e4688c70099e326f2a57f9 (diff)
parentdb579d7b25a483601ae9d8eec2846b4839cd97aa (diff)
downloadcpython-c0c03be53e15cd2e724808d83031d939da8fa57b.zip
cpython-c0c03be53e15cd2e724808d83031d939da8fa57b.tar.gz
cpython-c0c03be53e15cd2e724808d83031d939da8fa57b.tar.bz2
Merge 3.2.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_posixsubprocess.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
index ed2dd58..b8fb72f 100644
--- a/Modules/_posixsubprocess.c
+++ b/Modules/_posixsubprocess.c
@@ -579,6 +579,8 @@ subprocess_fork_exec(PyObject* self, PyObject *args)
/* 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)