diff options
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ctypes/_ctypes.c | 7 | ||||
| -rw-r--r-- | Modules/_ctypes/callproc.c | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index a5c00cd..25cf956 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -972,8 +972,11 @@ PyCPointerType_from_param(PyObject *type, PyObject *value) { StgDictObject *typedict; - if (value == Py_None) - return PyInt_FromLong(0); /* NULL pointer */ + if (value == Py_None) { + /* ConvParam will convert to a NULL pointer later */ + Py_INCREF(value); + return value; + } typedict = PyType_stgdict(type); assert(typedict); /* Cannot be NULL for pointer types */ diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index ec6d05b..cf17e3a 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -542,6 +542,7 @@ PyTypeObject PyCArg_Type = { * C function call. * * 1. Python integers are converted to C int and passed by value. + * Py_None is converted to a C NULL pointer. * * 2. 3-tuples are expected to have a format character in the first * item, which must be 'i', 'f', 'd', 'q', or 'P'. |