[Python-checkins] r58955 - in python/branches/release25-maint: Lib/test/seq_tests.py Objects/listobject.c

[guido.van.rossum]

Author: guido.van.rossum
Date: Mon Nov 12 21:04:41 2007
New Revision: 58955

Modified:
   python/branches/release25-maint/Lib/test/seq_tests.py
   python/branches/release25-maint/Objects/listobject.c
Log:
Issue 1704621. Fix segfaults in list_repeat() and list_inplace_repeat().
The C changes aren't quite the same as the patch given there; the test is.


Modified: python/branches/release25-maint/Lib/test/seq_tests.py
==============================================================================
--- python/branches/release25-maint/Lib/test/seq_tests.py	(original)
+++ python/branches/release25-maint/Lib/test/seq_tests.py	Mon Nov 12 21:04:41 2007
@@ -306,6 +306,13 @@
             self.assertEqual(self.type2test(s)*(-4), self.type2test([]))
             self.assertEqual(id(s), id(s*1))
 
+    def test_bigrepeat(self):
+        x = self.type2test([0])
+        x *= 2**16
+        self.assertRaises(MemoryError, x.__mul__, 2**16)
+        if hasattr(x, '__imul__'):
+            self.assertRaises(MemoryError, x.__imul__, 2**16)
+
     def test_subscript(self):
         a = self.type2test([10, 11])
         self.assertEqual(a.__getitem__(0L), 10)

Modified: python/branches/release25-maint/Objects/listobject.c
==============================================================================
--- python/branches/release25-maint/Objects/listobject.c	(original)
+++ python/branches/release25-maint/Objects/listobject.c	Mon Nov 12 21:04:41 2007
@@ -487,10 +487,10 @@
 	if (n < 0)
 		n = 0;
 	size = a->ob_size * n;
-	if (size == 0)
-              return PyList_New(0);
 	if (n && size/n != a->ob_size)
 		return PyErr_NoMemory();
+	if (size == 0)
+              return PyList_New(0);
 	np = (PyListObject *) PyList_New(size);
 	if (np == NULL)
 		return NULL;
@@ -661,7 +661,7 @@
 
 
 	size = PyList_GET_SIZE(self);
-	if (size == 0) {
+	if (size == 0 || n == 1) {
 		Py_INCREF(self);
 		return (PyObject *)self;
 	}
@@ -672,7 +672,10 @@
 		return (PyObject *)self;
 	}
 
-	if (list_resize(self, size*n) == -1)
+        p = size*n;
+        if (p/n != size)
+		return PyErr_NoMemory();
+	if (list_resize(self, p) == -1)
 		return NULL;
 
 	p = size;
@@ -2927,4 +2930,3 @@
 		return 0;
 	return len;
 }
-