Skip to content

bpo-35091: Objects/listobject.c: Don't rely on signed int overflow in… #10175

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

Closed
izbyshev wants to merge 1 commit into from
Closed

bpo-35091: Objects/listobject.c: Don't rely on signed int overflow in… #10175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 16 additions & 8 deletions Objects/listobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1358,9 +1358,11 @@ gallop_left(MergeState *ms, PyObject *key, PyObject **a, Py_ssize_t n, Py_ssize_
while (ofs < maxofs) {
IFLT(a[ofs], key) {
lastofs = ofs;
ofs = (ofs << 1) + 1;
if (ofs <= 0) /* int overflow */
if (ofs <= (PY_SSIZE_T_MAX - 1) >> 1) {
ofs = (ofs << 1) + 1;
} else {
ofs = maxofs;
}
}
else /* key <= a[hint + ofs] */
break;
Expand All @@ -1381,9 +1383,11 @@ gallop_left(MergeState *ms, PyObject *key, PyObject **a, Py_ssize_t n, Py_ssize_
break;
/* key <= a[hint - ofs] */
lastofs = ofs;
ofs = (ofs << 1) + 1;
if (ofs <= 0) /* int overflow */
if (ofs <= (PY_SSIZE_T_MAX - 1) >> 1) {
ofs = (ofs << 1) + 1;
} else {
ofs = maxofs;
}
}
if (ofs > maxofs)
ofs = maxofs;
Expand Down Expand Up @@ -1449,9 +1453,11 @@ gallop_right(MergeState *ms, PyObject *key, PyObject **a, Py_ssize_t n, Py_ssize
while (ofs < maxofs) {
IFLT(key, *(a-ofs)) {
lastofs = ofs;
ofs = (ofs << 1) + 1;
if (ofs <= 0) /* int overflow */
if (ofs <= (PY_SSIZE_T_MAX - 1) >> 1) {
ofs = (ofs << 1) + 1;
} else {
ofs = maxofs;
}
}
else /* a[hint - ofs] <= key */
break;
Expand All @@ -1473,9 +1479,11 @@ gallop_right(MergeState *ms, PyObject *key, PyObject **a, Py_ssize_t n, Py_ssize
break;
/* a[hint + ofs] <= key */
lastofs = ofs;
ofs = (ofs << 1) + 1;
if (ofs <= 0) /* int overflow */
if (ofs <= (PY_SSIZE_T_MAX - 1) >> 1) {
ofs = (ofs << 1) + 1;
} else {
ofs = maxofs;
}
}
if (ofs > maxofs)
ofs = maxofs;
Expand Down