summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-07-27 14:59:22 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2016-07-27 14:59:22 (GMT)
commit2561726aa6cd5b92a21e9a8510bd9eca02c5932a (patch)
tree32d8f4784749b6389fd2f31675bde4ba6feaf8da
parent755df2a55850dec2abb895c543540646134753bb (diff)
parente33797b686d764014aeaf80d7b4cb24863d238d9 (diff)
downloadcpython-2561726aa6cd5b92a21e9a8510bd9eca02c5932a.zip
cpython-2561726aa6cd5b92a21e9a8510bd9eca02c5932a.tar.gz
cpython-2561726aa6cd5b92a21e9a8510bd9eca02c5932a.tar.bz2
Merge 3.5 (issue #11048)
-rw-r--r--Modules/_ctypes/callbacks.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c
index 00e8e66..b958f30 100644
--- a/Modules/_ctypes/callbacks.c
+++ b/Modules/_ctypes/callbacks.c
@@ -305,7 +305,7 @@ static void closure_fcn(ffi_cif *cif,
static CThunkObject* CThunkObject_new(Py_ssize_t nArgs)
{
CThunkObject *p;
- int i;
+ Py_ssize_t i;
p = PyObject_GC_NewVar(CThunkObject, &PyCThunk_Type, nArgs);
if (p == NULL) {
@@ -313,11 +313,13 @@ static CThunkObject* CThunkObject_new(Py_ssize_t nArgs)
return NULL;
}
- p->pcl_exec = NULL;
p->pcl_write = NULL;
+ p->pcl_exec = NULL;
memset(&p->cif, 0, sizeof(p->cif));
+ p->flags = 0;
p->converters = NULL;
p->callable = NULL;
+ p->restype = NULL;
p->setfunc = NULL;
p->ffi_restype = NULL;