diff options
| -rw-r--r-- | Lib/test/test_capi.py | 13 | ||||
| -rw-r--r-- | Objects/abstract.c | 5 |
2 files changed, 18 insertions, 0 deletions
diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py index 2692b89d..d7d1ce7 100644 --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -11,6 +11,10 @@ import time import unittest from test import support try: + import _posixsubprocess +except ImportError: + _posixsubprocess = None +try: import threading except ImportError: threading = None @@ -78,6 +82,15 @@ class CAPITest(unittest.TestCase): else: self.assertTrue(False) + @unittest.skipUnless(_posixsubprocess, '_posixsubprocess required for this test.') + def test_seq_bytes_to_charp_array(self): + # Issue #15732: crash in _PySequence_BytesToCharpArray() + class Z(object): + def __len__(self): + return 1 + 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(threading, 'Threading required for this test.') class TestPendingCalls(unittest.TestCase): diff --git a/Objects/abstract.c b/Objects/abstract.c index aa43b72..5ac4ac9 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -2718,6 +2718,11 @@ _PySequence_BytesToCharpArray(PyObject* self) for (i = 0; i < argc; ++i) { char *data; item = PySequence_GetItem(self, i); + if (item == NULL) { + /* NULL terminate before freeing. */ + array[i] = NULL; + goto fail; + } data = PyBytes_AsString(item); if (data == NULL) { /* NULL terminate before freeing. */ |