From db579d7b25a483601ae9d8eec2846b4839cd97aa Mon Sep 17 00:00:00 2001
From: Stefan Krah <skrah@bytereef.org>
Date: Mon, 20 Aug 2012 14:36:47 +0200
Subject: Issue #15738: Fix a missing NULL check in subprocess_fork_exec().

---
 Lib/test/test_capi.py      | 10 ++++++++++
 Modules/_posixsubprocess.c |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py
index 0307394..612e639 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi.py
@@ -68,6 +68,16 @@ class CAPITest(unittest.TestCase):
         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
index 44e1613..c93f537 100644
--- a/Modules/_posixsubprocess.c
+++ b/Modules/_posixsubprocess.c
@@ -577,6 +577,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)
-- 
cgit v0.12