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.
........

diff --git a/Lib/test/list_tests.py b/Lib/test/list_tests.py
index 67492f38ba102366766c8874b7ee3e24f9fa5e4c..e2889cca6d2df43aaea9bdf8bf62c44073a7da94 100644 (file)
--- a/Lib/test/list_tests.py
+++ b/Lib/test/list_tests.py
@@ -540,6 +540,9 @@ class CommonTest(seq_tests.CommonTest):
         a = self.type2test(range(10))
         a[::2] = tuple(range(5))
         self.assertEqual(a, self.type2test([0, 1, 1, 3, 2, 5, 3, 7, 4, 9]))
+        # test issue7788
+        a = self.type2test(range(10))
+        del a[9::1<<333]
 
     def test_constructor_exception_handling(self):
         # Bug #1242657

diff --git a/Lib/test/test_array.py b/Lib/test/test_array.py
index 6ec9bb3ac4aec7d09499be90d4f919ea8896b65e..8a3796c82c37025a4144cad453382d2707065a5f 100755 (executable)
--- a/Lib/test/test_array.py
+++ b/Lib/test/test_array.py
@@ -1011,6 +1011,9 @@ class NumberTest(BaseTest):
         a = array.array(self.typecode, range(10))
         del a[::1000]
         self.assertEqual(a, array.array(self.typecode, [1,2,3,4,5,6,7,8,9]))
+        # test issue7788
+        a = array.array(self.typecode, range(10))
+        del a[9::1<<333]
 
     def test_assignment(self):
         a = array.array(self.typecode, range(10))

diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index 73f7c02cb332aa592ca0bb81a3180d5e0e68f86c..0af068557a4942748918fc40ae3b71d19a6518f9 100644 (file)
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -600,7 +600,7 @@ class ByteArrayTest(BaseBytesTest):
         self.assertEqual(b, bytearray([0, 1, 2, 42, 42, 42, 3, 4, 5, 6, 7, 8, 9]))
 
     def test_extended_set_del_slice(self):
-        indices = (0, None, 1, 3, 19, 300, -1, -2, -31, -300)
+        indices = (0, None, 1, 3, 19, 300, 1<<333, -1, -2, -31, -300)
         for start in indices:
             for stop in indices:
                 # Skip invalid step 0

diff --git a/Misc/NEWS b/Misc/NEWS
index 9baedef06dc47a46f04321fe5d74e13750be6184..0d94c45357bec0aea9e8af4a01eaafd6a57a53da 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 3.2 Alpha 1?
 Core and Builtins
 -----------------
 
+- Issue #7788: Fix an interpreter crash produced by deleting a list
+  slice with very large step value.
+
 - Issue #7766: Change sys.getwindowsversion() return value to a named
   tuple and add the additional members returned in an OSVERSIONINFOEX
   structure. The new members are service_pack_major, service_pack_minor,

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 479189067a92097d2efa588e99c37f41b6bab73c..e396716abdb1c7fcc337d103ebb86e52d220f116 100644 (file)
--- 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;

diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index 3603d4f9f8640d378b522ed068b2005e11d16b2b..42f1ed6e6f436c0d1483dcf248ebcf9e473740c0 100644 (file)
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -642,7 +642,8 @@ bytearray_ass_subscript(PyByteArrayObject *self, PyObject *index, PyObject *valu
     else {
         if (needed == 0) {
             /* Delete slice */
-            Py_ssize_t cur, i;
+            size_t cur;
+            Py_ssize_t i;
 
             if (!_canresize(self))
                 return -1;

diff --git a/Objects/listobject.c b/Objects/listobject.c
index f54b97ddb5888459b55fa297a2c620c233aba773..a97d47506f64c098c607a9937e83890fda498054 100644 (file)
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -2444,7 +2444,8 @@ list_ass_subscript(PyListObject* self, PyObject* item, PyObject* value)
                if (value == NULL) {
                        /* delete slice */
                        PyObject **garbage;
-                       Py_ssize_t cur, i;
+                       size_t cur;
+                       Py_ssize_t i;
 
                        if (slicelength <= 0)
                                return 0;