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

bpo-46323: _ctypes.CFuncPtr fails if _argtypes_ is too long (GH-31188)

Browse source 
ctypes.CFUNCTYPE() and ctypes.WINFUNCTYPE() now fail to create the
type if its "_argtypes_" member contains too many arguments.
Previously, the error was only raised when calling a function.

Change also how CFUNCTYPE() and WINFUNCTYPE() handle KeyError to
prevent creating a chain of exceptions if ctypes.CFuncPtr raises an
error.
This commit is contained in:
Victor Stinner 2022-02-07 14:53:15 +01:00 • committed by GitHub
parent 8e98175a03
commit 4cce1352bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 45 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/_ctypes/_ctypes.c
View file

@ -2382,7 +2382,6 @@ converters_from_argtypes(PyObject *ob)
_Py_IDENTIFIER(from_param);
PyObject *converters;
Py_ssize_t i;
Py_ssize_t nArgs;
ob = PySequence_Tuple(ob); /* new reference */
if (!ob) {
@ -2391,7 +2390,14 @@ converters_from_argtypes(PyObject *ob)
return NULL;
}
nArgs = PyTuple_GET_SIZE(ob);
Py_ssize_t nArgs = PyTuple_GET_SIZE(ob);
if (nArgs > CTYPES_MAX_ARGCOUNT) {
PyErr_Format(PyExc_ArgError,
"_argtypes_ has too many arguments (%zi), maximum is %i",
nArgs, CTYPES_MAX_ARGCOUNT);
return NULL;
}
converters = PyTuple_New(nArgs);
if (!converters) {
Py_DECREF(ob);

8
Modules/_ctypes/callproc.c
View file

@ -1118,14 +1118,6 @@ GetComError(HRESULT errcode, GUID *riid, IUnknown *pIunk)
#define IS_PASS_BY_REF(x) (x > 8 || !POW2(x))
#endif
/*
* bpo-13097: Max number of arguments _ctypes_callproc will accept.
*
* This limit is enforced for the `alloca()` call in `_ctypes_callproc`,
* to avoid allocating a massive buffer on the stack.
*/
#define CTYPES_MAX_ARGCOUNT 1024
/*
* Requirements, must be ensured by the caller:
* - argtuple is tuple of arguments

9
Modules/_ctypes/ctypes.h
View file

@ -11,6 +11,15 @@
#define PARAMFLAG_FLCID 0x4
#endif
/*
* bpo-13097: Max number of arguments CFuncPtr._argtypes_ and
* _ctypes_callproc() will accept.
*
* This limit is enforced for the `alloca()` call in `_ctypes_callproc`,
* to avoid allocating a massive buffer on the stack.
*/
#define CTYPES_MAX_ARGCOUNT 1024
typedef struct tagPyCArgObject PyCArgObject;
typedef struct tagCDataObject CDataObject;
typedef PyObject *(* GETFUNC)(void *, Py_ssize_t size);