From: Mark Dickinson <mdickinson@enthought.com>
Date: Sat, 24 Sep 2011 08:01:16 +0000 (+0100)
Subject: Backport issue #12973 itertools fix from 3.x.
X-Git-Tag: v2.7.3rc1~439
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a96b0d119d586b16f2b17fc36f49c44a5dde162d;p=thirdparty%2FPython%2Fcpython.git

Backport issue #12973 itertools fix from 3.x.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index b4dd2159c8fd..c4f0cb09fe6a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,9 +15,9 @@ Core and Builtins
 - Issue #12973: Fix overflow checks that invoked undefined behaviour in
   int.__pow__.  These overflow checks were causing int.__pow__ to produce
   incorrect results with recent versions of Clang, as a result of the
-  compiler optimizing the check away.  Also fix similar overflow check
-  in list_repeat (which caused test_list to fail with recent versions
-  of Clang).
+  compiler optimizing the check away.  Also fix similar overflow checks
+  in list_repeat (listobject.c) and islice_next (itertoolsmodule.c).  These
+  bugs caused test failures with recent versions of Clang.
 
 - Issue #12266: Fix str.capitalize() to correctly uppercase/lowercase
   titlecased and cased non-letter characters.
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
index ff25335c04bc..b51ccf96436c 100644
--- a/Modules/itertoolsmodule.c
+++ b/Modules/itertoolsmodule.c
@@ -1234,7 +1234,9 @@ islice_next(isliceobject *lz)
         return NULL;
     lz->cnt++;
     oldnext = lz->next;
-    lz->next += lz->step;
+    /* The (size_t) cast below avoids the danger of undefined
+       behaviour from signed integer overflow. */
+    lz->next += (size_t)lz->step;
     if (lz->next < oldnext || (stop != -1 && lz->next > stop))
         lz->next = stop;
     return item;