summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-01-29 17:27:24 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-01-29 17:27:24 (GMT)
commitbc09964be115a81e6324dbea5b5fc049759e9430 (patch)
treeb58af14e0ed48291a828a07307a28b1c114d9931 /Modules
parent8b441d0dcdb9380e999f0caead087c4365cb0bdd (diff)
downloadcpython-bc09964be115a81e6324dbea5b5fc049759e9430.zip
cpython-bc09964be115a81e6324dbea5b5fc049759e9430.tar.gz
cpython-bc09964be115a81e6324dbea5b5fc049759e9430.tar.bz2
Merged revisions 77821 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77821 | mark.dickinson | 2010-01-29 17:11:39 +0000 (Fri, 29 Jan 2010) | 3 lines Issue #7788: Fix a crash produced by deleting a list slice with huge step value. Patch by Marcin Bachry. ........
Diffstat (limited to 'Modules')
-rw-r--r--Modules/arraymodule.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 4791890..e396716 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -2199,8 +2199,9 @@ array_ass_subscr(arrayobject* self, PyObject* item, PyObject* value)
}
else if (needed == 0) {
/* Delete slice */
- Py_ssize_t cur, i;
-
+ size_t cur;
+ Py_ssize_t i;
+
if (step < 0) {
stop = start + 1;
start = stop + step * (slicelength - 1) - 1;