Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-06 07:22:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue #15736: Fix overflow in _PySequence_BytesToCharpArray().

Browse source
This commit is contained in:
Stefan Krah 2012-08-21 08:16:09 +02:00
parent 514dbb03ba
commit 7cacd2eb92
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/test_capi.py
View file

@ -67,6 +67,14 @@ 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)
# Issue #15736: overflow in _PySequence_BytesToCharpArray()
class Z(object):
def __len__(self):
return sys.maxsize
def __getitem__(self, i):
return b'x'
self.assertRaises(MemoryError, _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):

7
Objects/abstract.c
View file

@ -2728,6 +2728,13 @@ _PySequence_BytesToCharpArray(PyObject* self)
if (argc == -1)
return NULL;
assert(argc >= 0);
if ((size_t)argc > (PY_SSIZE_T_MAX-sizeof(char *)) / sizeof(char *)) {
PyErr_NoMemory();
return NULL;
}
array = malloc((argc + 1) * sizeof(char *));
if (array == NULL) {
PyErr_NoMemory();