Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

#13096: Fix segfault in CTypes POINTER handling of large values. 

Patch by Meador Inge.
This commit is contained in:
R David Murray 2014-10-12 13:54:48 -04:00
parent 4cfb5bee89
commit 817905b239
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/ctypes/test/test_pointers.py
View File

@ -7,6 +7,8 @@ ctype_types = [c_byte, c_ubyte, c_short, c_ushort, c_int, c_uint,
c_long, c_ulong, c_longlong, c_ulonglong, c_double, c_float]
python_types = [int, int, int, int, int, int,
int, int, int, int, float, float]
LargeNamedType = type('T' * 2 ** 25, (Structure,), {})
large_string = 'T' * 2 ** 25
class PointersTestCase(unittest.TestCase):
@ -188,5 +190,11 @@ class PointersTestCase(unittest.TestCase):
mth = WINFUNCTYPE(None)(42, "name", (), None)
self.assertEqual(bool(mth), True)
def test_pointer_type_name(self):
self.assertTrue(POINTER(LargeNamedType))
def test_pointer_type_str_name(self):
self.assertTrue(POINTER(large_string))
if __name__ == '__main__':
unittest.main()

3
Misc/NEWS
View File

@ -27,6 +27,9 @@ Core and Builtins
Library
-------
- Issue #13096: Fixed segfault in CTypes POINTER handling of large
values.
- Issue #11694: Raise ConversionError in xdrlib as documented. Patch
by Filip Gruszczyński and Claudiu Popa.

10
Modules/_ctypes/callproc.c
View File

@ -1672,24 +1672,30 @@ POINTER(PyObject *self, PyObject *cls)
}
if (PyUnicode_CheckExact(cls)) {
char *name = _PyUnicode_AsString(cls);
buf = alloca(strlen(name) + 3 + 1);
buf = PyMem_Malloc(strlen(name) + 3 + 1);
if (buf == NULL)
return PyErr_NoMemory();
sprintf(buf, "LP_%s", name);
result = PyObject_CallFunction((PyObject *)Py_TYPE(&PyCPointer_Type),
"s(O){}",
buf,
&PyCPointer_Type);
PyMem_Free(buf);
if (result == NULL)
return result;
key = PyLong_FromVoidPtr(result);
} else if (PyType_Check(cls)) {
typ = (PyTypeObject *)cls;
buf = alloca(strlen(typ->tp_name) + 3 + 1);
buf = PyMem_Malloc(strlen(typ->tp_name) + 3 + 1);
if (buf == NULL)
return PyErr_NoMemory();
sprintf(buf, "LP_%s", typ->tp_name);
result = PyObject_CallFunction((PyObject *)Py_TYPE(&PyCPointer_Type),
"s(O){sO}",
buf,
&PyCPointer_Type,
"_type_", cls);
PyMem_Free(buf);
if (result == NULL)
return result;
Py_INCREF(cls);