Skip to content

bpo-23325: Fix SIG_IGN and SIG_DFL int comparison in signal module #31759

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
miss-islington merged 4 commits into from
Mar 8, 2022
Merged

bpo-23325: Fix SIG_IGN and SIG_DFL int comparison in signal module #31759

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fdd38cb
bpo-23325: Fix SIG_IGN and SIG_DFL int comparison in signal module
tiran Mar 8, 2022
3438104
Fix comparison in PyErr_SetInterruptEx()
tiran Mar 8, 2022
cc4df05
Compare handler in a safe helper function
tiran Mar 8, 2022
76e3135
Use right order of arguments
tiran Mar 8, 2022
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
Prev Previous commit
Use right order of arguments
  • Loading branch information
@tiran
tiran committed Mar 8, 2022
commit 76e31353d9bb373640b0baad187a0abd3ad5dfcf
6 changes: 3 additions & 3 deletions Modules/signalmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,14 @@ get_signal_state(PyObject *module)


static inline int
compare_handler(PyObject *handler, PyObject *func)
compare_handler(PyObject *func, PyObject *dfl_ign_handler)
{
assert(PyLong_CheckExact(handler));
assert(PyLong_CheckExact(dfl_ign_handler));
if (!PyLong_CheckExact(func)) {
return 0;
}
// Assume that comparison of two PyLong objects will never fail.
return PyObject_RichCompareBool(func, handler, Py_EQ) == 1;
return PyObject_RichCompareBool(func, dfl_ign_handler, Py_EQ) == 1;
}

#ifdef HAVE_GETITIMER
Expand Down