summaryrefslogtreecommitdiffstats
path: root/Modules/_localemodule.c
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2020-03-17 17:09:46 (GMT)
committerGitHub <noreply@github.com>2020-03-17 17:09:46 (GMT)
commit5b1ef200d31a74a9b478d0217d73ed0a659a8a06 (patch)
tree3a3afde33a456ac49284058c00b1d685c54bcf3c /Modules/_localemodule.c
parent52268941f37e3e27bd01792b081877ec3bc9ce12 (diff)
downloadcpython-5b1ef200d31a74a9b478d0217d73ed0a659a8a06.zip
cpython-5b1ef200d31a74a9b478d0217d73ed0a659a8a06.tar.gz
cpython-5b1ef200d31a74a9b478d0217d73ed0a659a8a06.tar.bz2
bpo-39824: module_traverse() don't call m_traverse if md_state=NULL (GH-18738)
Extension modules: m_traverse, m_clear and m_free functions of PyModuleDef are no longer called if the module state was requested but is not allocated yet. This is the case immediately after the module is created and before the module is executed (Py_mod_exec function). More precisely, these functions are not called if m_size is greater than 0 and the module state (as returned by PyModule_GetState()) is NULL. Extension modules without module state (m_size <= 0) are not affected. Co-Authored-By: Petr Viktorin <encukou@gmail.com>
Diffstat (limited to 'Modules/_localemodule.c')
-rw-r--r--Modules/_localemodule.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c
index f68debd..d2202bc 100644
--- a/Modules/_localemodule.c
+++ b/Modules/_localemodule.c
@@ -778,9 +778,7 @@ static int
locale_traverse(PyObject *m, visitproc visit, void *arg)
{
_locale_state *state = (_locale_state*)PyModule_GetState(m);
- if (state) {
- Py_VISIT(state->Error);
- }
+ Py_VISIT(state->Error);
return 0;
}
@@ -788,9 +786,7 @@ static int
locale_clear(PyObject *m)
{
_locale_state *state = (_locale_state*)PyModule_GetState(m);
- if (state) {
- Py_CLEAR(state->Error);
- }
+ Py_CLEAR(state->Error);
return 0;
}