commit 98b49a00d413972965044fd355be3b8482caa07c
author Xiang Zhang <angwerzx@126.com> Wed May 10 19:00:15 2017 +0800
committer GitHub <noreply@github.com> Wed May 10 19:00:15 2017 +0800
tree 2b541b7bef96c4481b9683fef38e2b5afa68bec6
parent 81ed53784608d44a8d196ad52288b55c7bf665db

bpo-30281: Fix the default value for stop in PySlice_Unpack() (#1480) (#1529)

Objects/sliceobject.c

diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
index 6a69021..4e4b32d 100644
--- a/Objects/sliceobject.c
+++ b/Objects/sliceobject.c
@@ -197,6 +197,8 @@
     PySliceObject *r = (PySliceObject*)_r;
     /* this is harder to get right than you might think */
 
+    Py_BUILD_ASSERT(PY_SSIZE_T_MIN + 1 <= -PY_SSIZE_T_MAX);
+
     if (r->step == Py_None) {
         *step = 1;
     }
@@ -217,14 +219,14 @@
     }
 
     if (r->start == Py_None) {
-        *start = *step < 0 ? PY_SSIZE_T_MAX-1 : 0;;
+        *start = *step < 0 ? PY_SSIZE_T_MAX : 0;
     }
     else {
         if (!_PyEval_SliceIndex(r->start, start)) return -1;
     }
 
     if (r->stop == Py_None) {
-        *stop = *step < 0 ? -PY_SSIZE_T_MAX : PY_SSIZE_T_MAX;
+        *stop = *step < 0 ? PY_SSIZE_T_MIN : PY_SSIZE_T_MAX;
     }
     else {
         if (!_PyEval_SliceIndex(r->stop, stop)) return -1;
@@ -258,7 +260,7 @@
             *stop = (step < 0) ? -1 : 0;
         }
     }
-    else  if (*stop >= length) {
+    else if (*stop >= length) {
         *stop = (step < 0) ? length - 1 : length;
     }