Skip to content

[3.10] bpo-46383: Fix signature of zoneinfo module_free function (GH-30607) #30610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Jan 17, 2022
Merged

[3.10] bpo-46383: Fix signature of zoneinfo module_free function (GH-30607) #30610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
bpo-46383: Fix signature of zoneinfo module_free function (GH-30607) 
(cherry picked from commit cfbde65)

Co-authored-by: Christian Heimes <christian@python.org>
  • Loading branch information
@tiran @miss-islington
tiran authored and miss-islington committed Jan 15, 2022
commit bc0dac38c704f6b51645ae54b45ace63836c4917
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2022-01-14-20-55-34.bpo-46383.v8MTl4.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix invalid signature of ``_zoneinfo``'s ``module_free`` function to resolve
a crash on wasm32-emscripten platform.
2 changes: 1 addition & 1 deletion Modules/_zoneinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down