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 c9aa3160a9b930a8c0a0b7762c337324bec51269..8dd6de634e25cdf3a862911772dde4e4907ded30 100644 (file)
--- a/Lib/test/list_tests.py
+++ b/Lib/test/list_tests.py
@@ -519,6 +519,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 2c4c2fdc9f10fe849d2a3d34a023c8be1a97ef89..206042f7443249996013a8a67f4c71dc99921bb3 100755 (executable)
--- a/Lib/test/test_array.py
+++ b/Lib/test/test_array.py
@@ -850,6 +850,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 f8f36deef2a33d442ea86ff0aff8f104d7783d5c..85d5e0347e0c59599beccedbda0d8f21294f599d 100644 (file)
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -569,7 +569,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 d518010a39acd893176331bd1f96dc4bccbaf216..73267a8e2eafaef39aaf051b2b4f088304468651 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 2.6.5
 Core and Builtins
 -----------------
 
+- Issue #7788: Fix an interpreter crash produced by deleting a list
+  slice with very large step value.
+
 - Issue #7561: Operations on empty bytearrays (such as `int(bytearray())`)
   could crash in many places because of the PyByteArray_AS_STRING() macro
   returning NULL.  The macro now returns a statically allocated empty

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 6fad71c8a6a31a473a572d312b12f648bcdb3e7e..3b493d50f1f4b9b7de88ffdf3baacb66d95f62b5 100644 (file)
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1794,8 +1794,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 1b4c22a9e0630b9aef5858b78dd11e0cd3fa622e..a634cff27beb0ec2b4c3242da519a047e95f5d64 100644 (file)
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -699,7 +699,8 @@ bytes_ass_subscript(PyByteArrayObject *self, PyObject *index, PyObject *values)
     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 c5b147580292c55ccca97509d3f0b23482c3303c..843df6b0621850cf759da94ab6040ea37ba42582 100644 (file)
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -2604,7 +2604,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;