summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-01-29 17:29:21 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-01-29 17:29:21 (GMT)
commita53f2c997eb6070cc59a6675a10514c9e18f2c9e (patch)
tree138284fbad6d5684f473111a4a2d4e1006d1b4dc /Modules
parentd692c4a754c7a389d4dba4ca1f1d67ce5287e92d (diff)
downloadcpython-a53f2c997eb6070cc59a6675a10514c9e18f2c9e.zip
cpython-a53f2c997eb6070cc59a6675a10514c9e18f2c9e.tar.gz
cpython-a53f2c997eb6070cc59a6675a10514c9e18f2c9e.tar.bz2
Merged revisions 77823 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77823 | mark.dickinson | 2010-01-29 17:27:24 +0000 (Fri, 29 Jan 2010) | 10 lines 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 b24b4c9..aef0649 100644
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1733,8 +1733,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;