Skip to content

Fix issues reported by cpython-review-toolkit in faulthandler #151341

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

Open
vstinner wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −14
Open

Fix issues reported by cpython-review-toolkit in faulthandler #151341

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbd5ee0
Fix issues reported by cpython-review-toolkit in faulthandler
vstinner Jun 11, 2026
0872afc
Fix compiler warnings
vstinner Jun 11, 2026
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
25 changes: 11 additions & 14 deletions Modules/faulthandler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ static int
faulthandler_get_fileno(PyObject **file_ptr)
{
PyObject *result;
long fd_long;
int fd;
PyObject *file = *file_ptr;

if (file == NULL || file == Py_None) {
Expand All @@ -124,7 +122,7 @@ faulthandler_get_fileno(PyObject **file_ptr)
return -1;
}
}
fd = PyLong_AsInt(file);
int fd = PyLong_AsInt(file);
if (fd == -1 && PyErr_Occurred())
return -1;
if (fd < 0) {
Expand All @@ -145,15 +143,16 @@ faulthandler_get_fileno(PyObject **file_ptr)
return -1;
}

fd = -1;
int fd;
if (PyLong_Check(result)) {
fd_long = PyLong_AsLong(result);
if (0 <= fd_long && fd_long < INT_MAX)
fd = (int)fd_long;
fd = PyLong_AsInt(result);
}
else {
fd = -1;
}
Py_DECREF(result);

if (fd == -1) {
if (fd < 0) {
PyErr_SetString(PyExc_RuntimeError,
"file.fileno() is not a valid file descriptor");
Py_DECREF(file);
Expand Down Expand Up @@ -407,10 +406,8 @@ faulthandler_fatal_error(int signum)
PUTS(fd, "\n\n");
}
else {
char unknown_signum[23] = {0,};
snprintf(unknown_signum, 23, "%d", signum);
PUTS(fd, "Fatal Python error from unexpected signum: ");
PUTS(fd, unknown_signum);
_Py_DumpDecimal(fd, signum);
PUTS(fd, "\n\n");
}

Expand Down Expand Up @@ -713,7 +710,7 @@ faulthandler_thread(void *unused)
/* Timeout => dump traceback */
assert(st == PY_LOCK_FAILURE);

(void)_Py_write_noraise(thread.fd, thread.header, (int)thread.header_len);
(void)_Py_write_noraise(thread.fd, thread.header, thread.header_len);

errmsg = PyUnstable_DumpTracebackThreads(thread.fd, thread.interp, NULL,
thread.max_threads);
Expand Down Expand Up @@ -1224,7 +1221,7 @@ static PyObject *
faulthandler__fatal_error_c_thread_impl(PyObject *module)
/*[clinic end generated code: output=101bc8aaf4a5eec1 input=fbdca6fffd639a39]*/
{
long tid;
unsigned long tid;
PyThread_type_lock lock;

faulthandler_suppress_crash_report();
Expand All @@ -1236,7 +1233,7 @@ faulthandler__fatal_error_c_thread_impl(PyObject *module)
PyThread_acquire_lock(lock, WAIT_LOCK);

tid = PyThread_start_new_thread(faulthandler_fatal_error_thread, lock);
if (tid == -1) {
if (tid == PYTHREAD_INVALID_THREAD_ID) {
PyThread_free_lock(lock);
PyErr_SetString(PyExc_RuntimeError, "unable to start the thread");
return NULL;
Expand Down
Loading