summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2014-10-12 18:26:30 (GMT)
committerR David Murray <rdmurray@bitdance.com>2014-10-12 18:26:30 (GMT)
commit55bf20ad6e0bd9ca4c1b1a6dd7339972b4aa915e (patch)
tree1d1c00fcabce20b7c876966f90e3727cedb87071
parente73b8c64b8cc2531b21135e0d0f07de11dc76ab3 (diff)
downloadcpython-55bf20ad6e0bd9ca4c1b1a6dd7339972b4aa915e.zip
cpython-55bf20ad6e0bd9ca4c1b1a6dd7339972b4aa915e.tar.gz
cpython-55bf20ad6e0bd9ca4c1b1a6dd7339972b4aa915e.tar.bz2
#13096: Fix segfault in CTypes POINTER handling of large values.
Patch by Meador Inge.
-rw-r--r--Lib/ctypes/test/test_pointers.py8
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/_ctypes/callproc.c9
3 files changed, 18 insertions, 2 deletions
diff --git a/Lib/ctypes/test/test_pointers.py b/Lib/ctypes/test/test_pointers.py
index 9531158..3e74791 100644
--- a/Lib/ctypes/test/test_pointers.py
+++ b/Lib/ctypes/test/test_pointers.py
@@ -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, long,
int, long, long, long, 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()
diff --git a/Misc/NEWS b/Misc/NEWS
index 90966f2..6ff5fe5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,6 +37,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.
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
index 6642dc3..19f59e0 100644
--- a/Modules/_ctypes/callproc.c
+++ b/Modules/_ctypes/callproc.c
@@ -1807,7 +1807,9 @@ POINTER(PyObject *self, PyObject *cls)
return result;
}
if (PyString_CheckExact(cls)) {
- buf = alloca(strlen(PyString_AS_STRING(cls)) + 3 + 1);
+ buf = PyMem_Malloc(strlen(PyString_AS_STRING(cls)) + 3 + 1);
+ if (buf == NULL)
+ return PyErr_NoMemory();
sprintf(buf, "LP_%s", PyString_AS_STRING(cls));
result = PyObject_CallFunction((PyObject *)Py_TYPE(&PyCPointer_Type),
"s(O){}",
@@ -1818,13 +1820,16 @@ POINTER(PyObject *self, PyObject *cls)
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);