Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-46025: Fix a crash in the atexit module for auto-unregistering functions (GH-30002)

This commit is contained in:
Pablo Galindo Salgado 2021-12-09 13:53:44 +00:00 committed by GitHub
parent af6b406885
commit f0d290d25c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/test/_test_atexit.py
View File

@ -116,6 +116,21 @@ class GeneralTest(unittest.TestCase):
atexit._run_exitfuncs()
self.assertEqual(l, [5])
def test_atexit_with_unregistered_function(self):
# See bpo-46025 for more info
def func():
atexit.unregister(func)
1/0
atexit.register(func)
try:
with support.catch_unraisable_exception() as cm:
atexit._run_exitfuncs()
self.assertEqual(cm.unraisable.object, func)
self.assertEqual(cm.unraisable.exc_type, ZeroDivisionError)
self.assertEqual(type(cm.unraisable.exc_value), ZeroDivisionError)
finally:
atexit.unregister(func)
if __name__ == "__main__":
unittest.main()

2
Misc/NEWS.d/next/Core and Builtins/2021-12-09-11-41-35.bpo-46025.pkEvW9.rst Normal file
View File

@ -0,0 +1,2 @@
Fix a crash in the :mod:`atexit` module involving functions that unregister
themselves before raising exceptions. Patch by Pablo Galindo.

5
Modules/atexitmodule.c
View File

@ -93,13 +93,16 @@ atexit_callfuncs(struct atexit_state *state)
continue;
}
// bpo-46025: Increment the refcount of cb->func as the call itself may unregister it
PyObject* the_func = Py_NewRef(cb->func);
PyObject *res = PyObject_Call(cb->func, cb->args, cb->kwargs);
if (res == NULL) {
_PyErr_WriteUnraisableMsg("in atexit callback", cb->func);
_PyErr_WriteUnraisableMsg("in atexit callback", the_func);
}
else {
Py_DECREF(res);
}
Py_DECREF(the_func);
}
atexit_cleanup(state);