[Python-checkins] [2.7] bpo-16865: Support arrays >=2GB in ctypes. (GH-3006). (GH-7441)
Serhiy Storchaka
webhook-mailer at python.org
Tue Dec 4 05:38:11 EST 2018
https://github.com/python/cpython/commit/93d7918f77278f973a4a106c1d01ad2d9805816d
commit: 93d7918f77278f973a4a106c1d01ad2d9805816d
branch: 2.7
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2018-12-04T12:38:07+02:00
summary:
[2.7] bpo-16865: Support arrays >=2GB in ctypes. (GH-3006). (GH-7441)
(cherry picked from commit 735abadd5bd91db4a9e6f4311969b0afacca0a1a)
Co-Authored-By: Segev Finer <segev208 at gmail.com>
files:
A Misc/NEWS.d/next/Library/2017-09-29-16-40-38.bpo-16865.l-f6I_.rst
M Lib/ctypes/test/test_arrays.py
M Modules/_ctypes/_ctypes.c
diff --git a/Lib/ctypes/test/test_arrays.py b/Lib/ctypes/test/test_arrays.py
index 49aaab52b93b..53859a3e5e93 100644
--- a/Lib/ctypes/test/test_arrays.py
+++ b/Lib/ctypes/test/test_arrays.py
@@ -1,4 +1,6 @@
import unittest
+from test.support import precisionbigmemtest, _2G
+import sys
from ctypes import *
from ctypes.test import need_symbol
@@ -132,5 +134,10 @@ class my_int(c_int):
t2 = my_int * 1
self.assertIs(t1, t2)
+ @unittest.skipUnless(sys.maxsize > 2**32, 'requires 64bit platform')
+ @precisionbigmemtest(size=_2G, memuse=1, dry_run=False)
+ def test_large_array(self, size):
+ a = c_char * size
+
if __name__ == '__main__':
unittest.main()
diff --git a/Misc/NEWS.d/next/Library/2017-09-29-16-40-38.bpo-16865.l-f6I_.rst b/Misc/NEWS.d/next/Library/2017-09-29-16-40-38.bpo-16865.l-f6I_.rst
new file mode 100644
index 000000000000..afaff736bf1c
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-09-29-16-40-38.bpo-16865.l-f6I_.rst
@@ -0,0 +1 @@
+Support arrays >=2GiB in :mod:`ctypes`. Patch by Segev Finer.
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index fabbdf13e940..9b289af91be7 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -1460,24 +1460,36 @@ PyCArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
PyTypeObject *result;
StgDictObject *stgdict;
StgDictObject *itemdict;
- PyObject *proto;
+ PyObject *proto, *length_attr;
PyObject *typedict;
- long length;
-
+ Py_ssize_t length;
Py_ssize_t itemsize, itemalign;
typedict = PyTuple_GetItem(args, 2);
if (!typedict)
return NULL;
- proto = PyDict_GetItemString(typedict, "_length_"); /* Borrowed ref */
- if (!proto || !PyInt_Check(proto)) {
+ length_attr = PyDict_GetItemString(typedict, "_length_"); /* Borrowed ref */
+ if (!length_attr || !_PyAnyInt_Check(length_attr)) {
PyErr_SetString(PyExc_AttributeError,
"class must define a '_length_' attribute, "
"which must be a positive integer");
return NULL;
}
- length = PyInt_AS_LONG(proto);
+ if (PyInt_Check(length_attr)) {
+ length = PyInt_AS_LONG(length_attr);
+ }
+ else {
+ assert(PyLong_Check(length_attr));
+ length = PyLong_AsSsize_t(length_attr);
+ if (length == -1 && PyErr_Occurred()) {
+ if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
+ PyErr_SetString(PyExc_OverflowError,
+ "The '_length_' attribute is too large");
+ }
+ return NULL;
+ }
+ }
proto = PyDict_GetItemString(typedict, "_type_"); /* Borrowed ref */
if (!proto) {
More information about the Python-checkins
mailing list