0
0
mirror of https://github.com/python/cpython.git synced 2024-11-24 00:38:00 +01:00

gh-96055: Update faulthandler to emit proper unexpect signal number (gh-99162)

This commit is contained in:
Dong-hee Na 2022-11-07 10:19:25 +09:00 committed by GitHub
parent 57a405213c
commit f626b7b504
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 4 deletions

View File

@ -0,0 +1,2 @@
Update :mod:`faulthandler` to emit an error message with the proper
unexpected signal number. Patch by Dong-hee Na.

View File

@ -333,14 +333,17 @@ faulthandler_fatal_error(int signum)
size_t i;
fault_handler_t *handler = NULL;
int save_errno = errno;
int found = 0;
if (!fatal_error.enabled)
return;
for (i=0; i < faulthandler_nsignals; i++) {
handler = &faulthandler_handlers[i];
if (handler->signum == signum)
if (handler->signum == signum) {
found = 1;
break;
}
}
if (handler == NULL) {
/* faulthandler_nsignals == 0 (unlikely) */
@ -350,9 +353,18 @@ faulthandler_fatal_error(int signum)
/* restore the previous handler */
faulthandler_disable_fatal_handler(handler);
PUTS(fd, "Fatal Python error: ");
PUTS(fd, handler->name);
PUTS(fd, "\n\n");
if (found) {
PUTS(fd, "Fatal Python error: ");
PUTS(fd, handler->name);
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);
PUTS(fd, "\n\n");
}
faulthandler_dump_traceback(fd, fatal_error.all_threads,
fatal_error.interp);