summaryrefslogtreecommitdiffstats
path: root/Modules/_elementtree.c
diff options
context:
space:
mode:
authorZackery Spytz <zspytz@gmail.com>2019-05-17 07:13:03 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2019-05-17 07:13:03 (GMT)
commit14514d9084a40f599c57da853a305aa264562a43 (patch)
tree36cb61b74dbfda9ce1cdf72a864b640d0bda546d /Modules/_elementtree.c
parent870b035bc6da96689b59dd6f79782ec6f1873617 (diff)
downloadcpython-14514d9084a40f599c57da853a305aa264562a43.zip
cpython-14514d9084a40f599c57da853a305aa264562a43.tar.gz
cpython-14514d9084a40f599c57da853a305aa264562a43.tar.bz2
bpo-36946: Fix possible signed integer overflow when handling slices. (GH-13375)
The final addition (cur += step) may overflow, so use size_t for "cur". "cur" is always positive (even for negative steps), so it is safe to use size_t here. Co-Authored-By: Martin Panter <vadmium+py@gmail.com>
Diffstat (limited to 'Modules/_elementtree.c')
-rw-r--r--Modules/_elementtree.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index f5fc443..b1fb3ee 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -1809,7 +1809,8 @@ element_subscr(PyObject* self_, PyObject* item)
return element_getitem(self_, i);
}
else if (PySlice_Check(item)) {
- Py_ssize_t start, stop, step, slicelen, cur, i;
+ Py_ssize_t start, stop, step, slicelen, i;
+ size_t cur;
PyObject* list;
if (!self->extra)
@@ -1861,7 +1862,8 @@ element_ass_subscr(PyObject* self_, PyObject* item, PyObject* value)
return element_setitem(self_, i, value);
}
else if (PySlice_Check(item)) {
- Py_ssize_t start, stop, step, slicelen, newlen, cur, i;
+ Py_ssize_t start, stop, step, slicelen, newlen, i;
+ size_t cur;
PyObject* recycle = NULL;
PyObject* seq;