[Python-checkins] bpo-34397: Remove redundant overflow checks in list and tuple implementation. (GH-8757)
Sergey Fedoseev
webhook-mailer at python.org
Mon May 25 10:54:45 EDT 2020
https://github.com/python/cpython/commit/e682b26a6bc6d3db1a44d82db09d26224e82ccb5
commit: e682b26a6bc6d3db1a44d82db09d26224e82ccb5
branch: master
author: Sergey Fedoseev <fedoseev.sergey at gmail.com>
committer: GitHub <noreply at github.com>
date: 2020-05-25T07:54:40-07:00
summary:
bpo-34397: Remove redundant overflow checks in list and tuple implementation. (GH-8757)
files:
M Objects/listobject.c
M Objects/tupleobject.c
diff --git a/Objects/listobject.c b/Objects/listobject.c
index 37fadca129ac0..30d2620753744 100644
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -261,12 +261,8 @@ ins1(PyListObject *self, Py_ssize_t where, PyObject *v)
PyErr_BadInternalCall();
return -1;
}
- if (n == PY_SSIZE_T_MAX) {
- PyErr_SetString(PyExc_OverflowError,
- "cannot add more objects to list");
- return -1;
- }
+ assert((size_t)n + 1 < PY_SSIZE_T_MAX);
if (list_resize(self, n+1) < 0)
return -1;
@@ -301,12 +297,7 @@ app1(PyListObject *self, PyObject *v)
Py_ssize_t n = PyList_GET_SIZE(self);
assert (v != NULL);
- if (n == PY_SSIZE_T_MAX) {
- PyErr_SetString(PyExc_OverflowError,
- "cannot add more objects to list");
- return -1;
- }
-
+ assert((size_t)n + 1 < PY_SSIZE_T_MAX);
if (list_resize(self, n+1) < 0)
return -1;
@@ -503,8 +494,7 @@ list_concat(PyListObject *a, PyObject *bb)
return NULL;
}
#define b ((PyListObject *)bb)
- if (Py_SIZE(a) > PY_SSIZE_T_MAX - Py_SIZE(b))
- return PyErr_NoMemory();
+ assert((size_t)Py_SIZE(a) + (size_t)Py_SIZE(b) < PY_SSIZE_T_MAX);
size = Py_SIZE(a) + Py_SIZE(b);
np = (PyListObject *) list_new_prealloc(size);
if (np == NULL) {
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c
index c0b59c009a2e9..14534632dfea7 100644
--- a/Objects/tupleobject.c
+++ b/Objects/tupleobject.c
@@ -486,8 +486,7 @@ tupleconcat(PyTupleObject *a, PyObject *bb)
Py_INCREF(a);
return (PyObject *)a;
}
- if (Py_SIZE(a) > PY_SSIZE_T_MAX - Py_SIZE(b))
- return PyErr_NoMemory();
+ assert((size_t)Py_SIZE(a) + (size_t)Py_SIZE(b) < PY_SSIZE_T_MAX);
size = Py_SIZE(a) + Py_SIZE(b);
if (size == 0) {
return PyTuple_New(0);
More information about the Python-checkins
mailing list