[Python-checkins] r53665 - in python/branches/release25-maint: Lib/test/test_itertools.py Misc/NEWS Modules/itertoolsmodule.c Objects/enumobject.c

[raymond.hettinger]

Author: raymond.hettinger
Date: Thu Feb  8 00:57:05 2007
New Revision: 53665

Modified:
   python/branches/release25-maint/Lib/test/test_itertools.py
   python/branches/release25-maint/Misc/NEWS
   python/branches/release25-maint/Modules/itertoolsmodule.c
   python/branches/release25-maint/Objects/enumobject.c
Log:
Do not let overflows in enumerate() and count() pass silently.

Modified: python/branches/release25-maint/Lib/test/test_itertools.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_itertools.py	(original)
+++ python/branches/release25-maint/Lib/test/test_itertools.py	Thu Feb  8 00:57:05 2007
@@ -52,8 +52,7 @@
         self.assertEqual(take(2, zip('abc',count(3))), [('a', 3), ('b', 4)])
         self.assertRaises(TypeError, count, 2, 3)
         self.assertRaises(TypeError, count, 'a')
-        c = count(sys.maxint-2)   # verify that rollover doesn't crash
-        c.next(); c.next(); c.next(); c.next(); c.next()
+        self.assertRaises(OverflowError, list, islice(count(sys.maxint-5), 10))
         c = count(3)
         self.assertEqual(repr(c), 'count(3)')
         c.next()

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Thu Feb  8 00:57:05 2007
@@ -12,6 +12,8 @@
 Core and builtins
 -----------------
 
+- SF #151204:  enumerate() now raises an Overflow error at sys.maxint items.
+
 - Bug #1377858: Fix the segfaulting of the interpreter when an object created
   a weakref on itself during a __del__ call for new-style classes (classic
   classes still have the bug).
@@ -103,6 +105,8 @@
 Extension Modules
 -----------------
 
+- operator.count() now raises an OverflowError when the count reaches sys.maxint.
+
 - Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
 
 - collections.defaultdict() now verifies that the factory function is callable.

Modified: python/branches/release25-maint/Modules/itertoolsmodule.c
==============================================================================
--- python/branches/release25-maint/Modules/itertoolsmodule.c	(original)
+++ python/branches/release25-maint/Modules/itertoolsmodule.c	Thu Feb  8 00:57:05 2007
@@ -2073,6 +2073,11 @@
 static PyObject *
 count_next(countobject *lz)
 {
+        if (lz->cnt == LONG_MAX) {
+                PyErr_SetString(PyExc_OverflowError,
+                        "cannot count beyond LONG_MAX");                
+                return NULL;         
+        }
 	return PyInt_FromSsize_t(lz->cnt++);
 }
 

Modified: python/branches/release25-maint/Objects/enumobject.c
==============================================================================
--- python/branches/release25-maint/Objects/enumobject.c	(original)
+++ python/branches/release25-maint/Objects/enumobject.c	Thu Feb  8 00:57:05 2007
@@ -62,6 +62,12 @@
 	PyObject *result = en->en_result;
 	PyObject *it = en->en_sit;
 
+	if (en->en_index == LONG_MAX) {
+		PyErr_SetString(PyExc_OverflowError,
+			"enumerate() is limited to LONG_MAX items");                
+		return NULL;         
+	}
+
 	next_item = (*it->ob_type->tp_iternext)(it);
 	if (next_item == NULL)
 		return NULL;