Handle really big steps in extended slices.

Fixes a test failure on 64 bit platforms (I hope).

diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
index a035e5faf01262b9e5367f50fc11119829e8a600..7198cca4b1c71d85d166c6a7512815a03371c710 100644 (file)
--- a/Objects/sliceobject.c
+++ b/Objects/sliceobject.c
@@ -121,11 +121,8 @@ PySlice_GetIndicesEx(PySliceObject *r, int length,
                *step = 1;
        } 
        else {
-               *step = PyInt_AsLong(r->step);
-               if (*step == -1 && PyErr_Occurred()) {
-                       return -1;
-               }
-               else if (*step == 0) {
+               if (!_PyEval_SliceIndex(r->step, step)) return -1;
+               if (*step == 0) {
                        PyErr_SetString(PyExc_ValueError,
                                        "slice step cannot be zero");
                        return -1;

diff --git a/Python/ceval.c b/Python/ceval.c
index afc480e151e29bcde7a700a1e6670298fa8ffc40..09b88a6ca7806197241e636e95bdb806e3d70811 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3507,7 +3507,7 @@ _PyEval_SliceIndex(PyObject *v, int *pi)
                if (x > INT_MAX)
                        x = INT_MAX;
                else if (x < -INT_MAX)
-                       x = 0;
+                       x = -INT_MAX;
                *pi = x;
        }
        return 1;