[GR-54236] Avoid direct slice access in cffi

PullRequest: graalpython/3343

Author: msimacek

graalpython/lib-graalpython/patches/cffi/cffi-1.15.1.patch

@@ -1,3 +1,35 @@
+diff --git a/c/_cffi_backend.c b/c/_cffi_backend.c
+index b9618bd..fbfd82b 100644
+--- a/c/_cffi_backend.c
++++ b/c/_cffi_backend.c
+@@ -2507,19 +2507,22 @@ _cdata_getslicearg(CDataObject *cd, PySliceObject *slice, Py_ssize_t bounds[])
+     Py_ssize_t start, stop;
+     CTypeDescrObject *ct;
+ 
+-    start = PyInt_AsSsize_t(slice->start);
++    PyObject* slicestart = PySlice_Start(slice);
++    start = PyInt_AsSsize_t(slicestart);
+     if (start == -1 && PyErr_Occurred()) {
+-        if (slice->start == Py_None)
++        if (slicestart == Py_None)
+             PyErr_SetString(PyExc_IndexError, "slice start must be specified");
+         return NULL;
+     }
+-    stop = PyInt_AsSsize_t(slice->stop);
++    PyObject* slicestop = PySlice_Stop(slice);
++    stop = PyInt_AsSsize_t(slicestop);
+     if (stop == -1 && PyErr_Occurred()) {
+-        if (slice->stop == Py_None)
++        if (slicestop == Py_None)
+             PyErr_SetString(PyExc_IndexError, "slice stop must be specified");
+         return NULL;
+     }
+-    if (slice->step != Py_None) {
++    PyObject* slicestep = PySlice_Step(slice);
++    if (slicestep != Py_None) {
+         PyErr_SetString(PyExc_IndexError, "slice with step not supported");
+         return NULL;
+     }
 diff --git a/c/misc_thread_common.h b/c/misc_thread_common.h
 index 66e2835..b48fd85 100644
 --- a/c/misc_thread_common.h

graalpython/lib-graalpython/patches/cffi/cffi-1.16.0.patch

@@ -1,7 +1,40 @@
-index 7d29634b..bb440851 100644
+diff --git a/src/c/_cffi_backend.c b/src/c/_cffi_backend.c
+index c5ea2cb..b797540 100644
+--- a/src/c/_cffi_backend.c
++++ b/src/c/_cffi_backend.c
+@@ -2516,19 +2516,22 @@ _cdata_getslicearg(CDataObject *cd, PySliceObject *slice, Py_ssize_t bounds[])
+     Py_ssize_t start, stop;
+     CTypeDescrObject *ct;
+ 
+-    start = PyInt_AsSsize_t(slice->start);
++    PyObject* slicestart = PySlice_Start(slice);
++    start = PyInt_AsSsize_t(slicestart);
+     if (start == -1 && PyErr_Occurred()) {
+-        if (slice->start == Py_None)
++        if (slicestart == Py_None)
+             PyErr_SetString(PyExc_IndexError, "slice start must be specified");
+         return NULL;
+     }
+-    stop = PyInt_AsSsize_t(slice->stop);
++    PyObject* slicestop = PySlice_Stop(slice);
++    stop = PyInt_AsSsize_t(slicestop);
+     if (stop == -1 && PyErr_Occurred()) {
+-        if (slice->stop == Py_None)
++        if (slicestop == Py_None)
+             PyErr_SetString(PyExc_IndexError, "slice stop must be specified");
+         return NULL;
+     }
+-    if (slice->step != Py_None) {
++    PyObject* slicestep = PySlice_Step(slice);
++    if (slicestep != Py_None) {
+         PyErr_SetString(PyExc_IndexError, "slice with step not supported");
+         return NULL;
+     }
+diff --git a/src/c/misc_thread_common.h b/src/c/misc_thread_common.h
+index ead9c83..a3ca2fe 100644
 --- a/src/c/misc_thread_common.h
 +++ b/src/c/misc_thread_common.h
-@@ -344,45 +344,7 @@ static PyThreadState *get_current_ts(void)
+@@ -342,45 +342,7 @@ static PyThreadState *get_current_ts(void)
 
  static PyGILState_STATE gil_ensure(void)
  {