gh-91353: Fix void return type handling in ctypes (GH-32246)

hoodmane · web-flow · commit 1b035d9699aa · 2022-04-14T16:27:01.000+02:00
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-04-03-17-21-04.bpo-47197.Ji_c30.rst b/Misc/NEWS.d/next/Core and Builtins/2022-04-03-17-21-04.bpo-47197.Ji_c30.rst
@@ -0,0 +1,5 @@
+ctypes used to mishandle ``void`` return types, so that for instance a
+function declared like ``ctypes.CFUNCTYPE(None, ctypes.c_int)`` would be
+called with signature ``int f(int)`` instead of ``void f(int)``. Wasm
+targets require function pointers to be called with the correct signatures
+so this led to crashes. The problem is now fixed.
diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c
@@ -399,7 +399,7 @@ CThunkObject *_ctypes_alloc_callback(PyObject *callable,
 #endif
     result = ffi_prep_cif(&p->cif, cc,
                           Py_SAFE_DOWNCAST(nargs, Py_ssize_t, int),
-                          _ctypes_get_ffi_type(restype),
+                          p->ffi_restype,
                           &p->atypes[0]);
     if (result != FFI_OK) {
         PyErr_Format(PyExc_RuntimeError,
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
@@ -1209,7 +1209,12 @@ PyObject *_ctypes_callproc(PPROC pProc,
         }
     }
 
-    rtype = _ctypes_get_ffi_type(restype);
+    if (restype == Py_None) {
+        rtype = &ffi_type_void;
+    } else {
+        rtype = _ctypes_get_ffi_type(restype);
+    }
+
     resbuf = alloca(max(rtype->size, sizeof(ffi_arg)));
 
 #ifdef _Py_MEMORY_SANITIZER

Original file line number	Diff line number	Diff line change
`@@ -1209,7 +1209,12 @@ PyObject *_ctypes_callproc(PPROC pProc,`
`1209`	`1209`	`}`
`1210`	`1210`	`}`
`1211`	`1211`
`1212`		`- rtype = _ctypes_get_ffi_type(restype);`
	`1212`	`+ if (restype == Py_None) {`
	`1213`	`+ rtype = &ffi_type_void;`
	`1214`	`+ } else {`
	`1215`	`+ rtype = _ctypes_get_ffi_type(restype);`
	`1216`	`+ }`
	`1217`	`+`
`1213`	`1218`	`resbuf = alloca(max(rtype->size, sizeof(ffi_arg)));`
`1214`	`1219`
`1215`	`1220`	`#ifdef _Py_MEMORY_SANITIZER`