Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 11 additions & 0 deletions Lib/test/test_faulthandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -817,6 +817,17 @@ def test_disable_windows_exc_handler(self):
self.assertEqual(output, [])
self.assertEqual(exitcode, 0xC0000005)

def test_cancel_later_without_dump_traceback_later(self):
# bpo-37933: Calling cancel_dump_traceback_later()
# without dump_traceback_later() must not segfault.
code = dedent("""
import faulthandler
faulthandler.cancel_dump_traceback_later()
""")
output, exitcode = self.get_output(code)
self.assertEqual(output, [])
self.assertEqual(exitcode, 0)


if __name__ == "__main__":
unittest.main()
5 changes: 5 additions & 0 deletions Modules/faulthandler.c
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,11 @@ faulthandler_thread(void *unused)
static void
cancel_dump_traceback_later(void)
{
/* If not scheduled, nothing to cancel */
if (!thread.cancel_event) {
return;
}

/* Notify cancellation */
PyThread_release_lock(thread.cancel_event);

Expand Down