Mailing List Archive

https://github.com/python/cpython/commit/7a822c92782ffda8fa32a4b30a95b9de7cc1b8e6
commit: 7a822c92782ffda8fa32a4b30a95b9de7cc1b8e6
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
committer: vstinner <vstinner@python.org>
date: 2022-01-17T14:47:51+01:00
summary:

bpo-46383: Fix signature of zoneinfo module_free function (GH-30607) (GH-30610)

(cherry picked from commit cfbde65df318eea243706ff876e5ef834c085e5f)

Co-authored-by: Christian Heimes <christian@python.org>

Co-authored-by: Christian Heimes <christian@python.org>

files:
A Misc/NEWS.d/next/Core and Builtins/2022-01-14-20-55-34.bpo-46383.v8MTl4.rst
M 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
index 0000000000000..8f8b12732a690
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2022-01-14-20-55-34.bpo-46383.v8MTl4.rst
@@ -0,0 +1,2 @@
+Fix invalid signature of ``_zoneinfo``'s ``module_free`` function to resolve
+a crash on wasm32-emscripten platform.
diff --git a/Modules/_zoneinfo.c b/Modules/_zoneinfo.c
index 04fa09422b213..0388d27ce10a4 100644
--- a/Modules/_zoneinfo.c
+++ b/Modules/_zoneinfo.c
@@ -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;

_______________________________________________
Python-checkins mailing list
Python-checkins@python.org
https://mail.python.org/mailman/listinfo/python-checkins