[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 (issue #11048)

Wed Jul 27 11:00:40 EDT 2016

https://hg.python.org/cpython/rev/da9898e7e90d
changeset: 102461:da9898e7e90d
parent: 102459:8224ad99842e
parent: 102460:ab4975520c7d
user: Victor Stinner <victor.stinner at gmail.com>
date: Wed Jul 27 16:59:22 2016 +0200
summary:
 Merge 3.5 (issue #11048)
files:
 Modules/_ctypes/callbacks.c | 6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c
--- a/Modules/_ctypes/callbacks.c
+++ b/Modules/_ctypes/callbacks.c
@@ -305,7 +305,7 @@
 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 @@
 return NULL;
 }
 
+ p->pcl_write = NULL;
 p->pcl_exec = NULL;
- p->pcl_write = 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;
 
-- 
Repository URL: https://hg.python.org/cpython
