diff options
| author | Xiang Zhang <angwerzx@126.com> | 2017-05-10 11:00:15 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-10 11:00:15 (GMT) |
| commit | 98b49a00d413972965044fd355be3b8482caa07c (patch) | |
| tree | 2b541b7bef96c4481b9683fef38e2b5afa68bec6 | |
| parent | 81ed53784608d44a8d196ad52288b55c7bf665db (diff) | |
| download | cpython-98b49a00d413972965044fd355be3b8482caa07c.zip cpython-98b49a00d413972965044fd355be3b8482caa07c.tar.gz cpython-98b49a00d413972965044fd355be3b8482caa07c.tar.bz2 | |
bpo-30281: Fix the default value for stop in PySlice_Unpack() (#1480) (#1529)
| -rw-r--r-- | Objects/sliceobject.c | 8 | ||||
| -rw-r--r-- | Python/ceval.c | 2 |
2 files changed, 6 insertions, 4 deletions
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 @@ PySlice_Unpack(PyObject *_r, 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 @@ PySlice_Unpack(PyObject *_r, } 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 @@ PySlice_AdjustIndices(Py_ssize_t length, *stop = (step < 0) ? -1 : 0; } } - else if (*stop >= length) { + else if (*stop >= length) { *stop = (step < 0) ? length - 1 : length; } diff --git a/Python/ceval.c b/Python/ceval.c index bce86ab..5dc0444 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -5071,7 +5071,7 @@ do_call_core(PyObject *func, PyObject *callargs, PyObject *kwdict) /* Extract a slice index from a PyLong or an object with the nb_index slot defined, and store in *pi. Silently reduce values larger than PY_SSIZE_T_MAX to PY_SSIZE_T_MAX, - and silently boost values less than -PY_SSIZE_T_MAX-1 to -PY_SSIZE_T_MAX-1. + and silently boost values less than PY_SSIZE_T_MIN to PY_SSIZE_T_MIN. Return 0 on error, 1 on success. */ int |