commit e41390aca51e4e3eb455cf3b70f5d656a2814db9
author Serhiy Storchaka <storchaka@gmail.com> Sat Apr 08 11:48:57 2017 +0300
committer GitHub <noreply@github.com> Sat Apr 08 11:48:57 2017 +0300
tree e90f8b0b47ec38d5dc7871b4e5b0f944c46473a4
parent 7f85947106aff5b1f166a57f644f987db4d38bf0

bpo-27867: Expand the PySlice_GetIndicesEx macro. (#1023) (#1046)

(cherry picked from commit b879fe8)

Objects/stringobject.c

diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 9b93898..ef4f8c1 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -1310,11 +1310,11 @@
         char* result_buf;
         PyObject* result;
 
-        if (PySlice_GetIndicesEx((PySliceObject*)item,
-                         PyString_GET_SIZE(self),
-                         &start, &stop, &step, &slicelength) < 0) {
+        if (_PySlice_Unpack((PySliceObject *)item, &start, &stop, &step) < 0) {
             return NULL;
         }
+        slicelength = _PySlice_AdjustIndices(PyString_GET_SIZE(self), &start,
+                                            &stop, step);
 
         if (slicelength <= 0) {
             return PyString_FromStringAndSize("", 0);