Skip to content
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

gh-101965: Fix usage of Py_EnterRecursiveCall return value in _bisectmodule.c #101966

Merged
merged 3 commits into from
Feb 21, 2023
Merged

gh-101965: Fix usage of Py_EnterRecursiveCall return value in _bisectmodule.c #101966

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a01fd1e
Fix incorrect usage of Py_EnterRecursiveCall() in main
OTheDev Feb 16, 2023
5e489a0
Merge branch 'main' into fix-incorrect-Py_EnterRecursiveCall-usage
hauntsaninja Feb 20, 2023
11320b0
Pull in main
erlend-aasland Feb 21, 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
4 changes: 2 additions & 2 deletions Modules/_bisectmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ internal_bisect_right(PyObject *list, PyObject *item, Py_ssize_t lo, Py_ssize_t
if (sq_item == NULL) {
return -1;
}
if (Py_EnterRecursiveCall("in _bisect.bisect_right") < 0) {
if (Py_EnterRecursiveCall("in _bisect.bisect_right")) {
OTheDev marked this conversation as resolved.
Show resolved Hide resolved
return -1;
}
PyTypeObject *tp = Py_TYPE(item);
Expand Down Expand Up @@ -246,7 +246,7 @@ internal_bisect_left(PyObject *list, PyObject *item, Py_ssize_t lo, Py_ssize_t h
if (sq_item == NULL) {
return -1;
}
if (Py_EnterRecursiveCall("in _bisect.bisect_left") < 0) {
if (Py_EnterRecursiveCall("in _bisect.bisect_left")) {
return -1;
}
PyTypeObject *tp = Py_TYPE(item);
Expand Down
2 changes: 1 addition & 1 deletion Python/pythonrun.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@ print_chained(struct exception_print_context* ctx, PyObject *value,
{
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