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

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 93c6cc0e6a637fdba523e4b5d94df19284134864..dd01574174a46a030d96846a6df4927ce083d456 100755 (executable)
--- a/Lib/test/test_array.py
+++ b/Lib/test/test_array.py
@@ -848,6 +848,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 9ccc7874abce2bb0f1270646dbd582a135212217..b83a83fd4b255c560165797ff19cf636df19fb6c 100644 (file)
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -595,7 +595,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 e3d94da82db32d4791a147b665fdbde6f8b2867a..4eba51b353f3585e0fc751e81467d286dd1854e9 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,9 @@ What's New in Python 3.1.2?
 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 b24b4c9f13e4b9b514b83704c7c0f995a0714de0..aef06495ab33ed1003deb523b30e2349e60e8324 100644 (file)
--- 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;

diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
index d80e694ba956d6eaf1ff47b7f37d82e855d1e7d3..39aa69a40492d7213735bdd87b3f28c4ef35a5b6 100644 (file)
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -650,7 +650,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 09fba48f6dcb11255f57343dad4584d5c5d84b75..c1ece2b85f4e62456aa15c4a445c3b3f43673444 100644 (file)
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -2430,7 +2430,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;