Merge 3.5 (issue #11048)

This commit is contained in:
Victor Stinner 2016-07-27 16:59:22 +02:00
commit 2561726aa6
1 changed files with 4 additions and 2 deletions

View File

@ -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;