summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Objects/sliceobject.c7
-rw-r--r--Python/ceval.c2
2 files changed, 3 insertions, 6 deletions
diff --git a/Objects/sliceobject.c b/Objects/sliceobject.c
index a035e5f..7198cca 100644
--- 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 afc480e..09b88a6 100644
--- 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;