Skip to content

gh-102056: Fix a few bugs in error handling of exception printing code #102078

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
iritkatriel merged 4 commits into from
Feb 20, 2023
Merged

gh-102056: Fix a few bugs in error handling of exception printing code #102078

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2256302
gh-102056: Fix a few bugs in error handling of exception printing code
iritkatriel Feb 20, 2023
bd42431
📜🤖 Added by blurb_it.
blurb-it[bot] Feb 20, 2023
79ccb6d
follow the style of other files
iritkatriel Feb 20, 2023
8e7e766
add test
iritkatriel Feb 20, 2023
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
Next Next commit
follow the style of other files
  • Loading branch information
@iritkatriel
iritkatriel committed Feb 20, 2023
commit 79ccb6d98680b9897d29332868a6fdf69af952f6
6 changes: 3 additions & 3 deletions Python/pythonrun.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1246,7 +1246,7 @@ print_chained(struct exception_print_context* ctx, PyObject *value,
const char * message, const char *tag)
{
PyObject *f = ctx->file;
if (_Py_EnterRecursiveCall(" in print_chained") != 0) {
if (_Py_EnterRecursiveCall(" in print_chained")) {
return -1;
}
bool need_close = ctx->need_close;
Expand Down Expand Up @@ -1425,7 +1425,7 @@ print_exception_group(struct exception_print_context *ctx, PyObject *value)
PyObject *exc = PyTuple_GET_ITEM(excs, i);

if (!truncated) {
if (_Py_EnterRecursiveCall(" in print_exception_group") != 0) {
if (_Py_EnterRecursiveCall(" in print_exception_group")) {
return -1;
}
int res = print_exception_recursive(ctx, exc);
Expand Down Expand Up @@ -1478,7 +1478,7 @@ print_exception_group(struct exception_print_context *ctx, PyObject *value)
static int
print_exception_recursive(struct exception_print_context *ctx, PyObject *value)
{
if (_Py_EnterRecursiveCall(" in print_exception_recursive") != 0) {
if (_Py_EnterRecursiveCall(" in print_exception_recursive")) {
return -1;
}
if (ctx->seen != NULL) {
Expand Down