summaryrefslogtreecommitdiffstats
path: root/Modules/mmapmodule.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/mmapmodule.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/mmapmodule.c')
-rw-r--r--Modules/mmapmodule.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index 6ddbf70..33366b2 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -806,7 +806,8 @@ mmap_subscript(mmap_object *self, PyObject *item)
slicelen);
else {
char *result_buf = (char *)PyMem_Malloc(slicelen);
- Py_ssize_t cur, i;
+ size_t cur;
+ Py_ssize_t i;
PyObject *result;
if (result_buf == NULL)
@@ -926,7 +927,8 @@ mmap_ass_subscript(mmap_object *self, PyObject *item, PyObject *value)
memcpy(self->data + start, vbuf.buf, slicelen);
}
else {
- Py_ssize_t cur, i;
+ size_t cur;
+ Py_ssize_t i;
for (cur = start, i = 0;
i < slicelen;