]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-46383: Fix signature of zoneinfo module_free function (GH-30607) (GH-30610)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Mon, 17 Jan 2022 13:47:51 +0000 (05:47 -0800)
committerGitHub <noreply@github.com>
Mon, 17 Jan 2022 13:47:51 +0000 (14:47 +0100)
(cherry picked from commit cfbde65df318eea243706ff876e5ef834c085e5f)

Co-authored-by: Christian Heimes <christian@python.org>
Co-authored-by: Christian Heimes <christian@python.org>
Misc/NEWS.d/next/Core and Builtins/2022-01-14-20-55-34.bpo-46383.v8MTl4.rst [new file with mode: 0644]
Modules/_zoneinfo.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-01-14-20-55-34.bpo-46383.v8MTl4.rst b/Misc/NEWS.d/next/Core and Builtins/2022-01-14-20-55-34.bpo-46383.v8MTl4.rst
new file mode 100644 (file)
index 0000000..8f8b127
--- /dev/null
@@ -0,0 +1,2 @@
+Fix invalid signature of ``_zoneinfo``'s ``module_free`` function to resolve
+a crash on wasm32-emscripten platform.
index 04fa09422b2134c0ab425f2a4491062ccfe7b478..0388d27ce10a489555189e068c37b5cc257cfc4b 100644 (file)
@@ -2608,7 +2608,7 @@ static PyTypeObject PyZoneInfo_ZoneInfoType = {
 // Specify the _zoneinfo module
 static PyMethodDef module_methods[] = {{NULL, NULL}};
 static void
-module_free(void)
+module_free(void *m)
 {
     Py_XDECREF(_tzpath_find_tzfile);
     _tzpath_find_tzfile = NULL;