archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T89450: Crash slicing BMEditSelSeq

Browse Source 
Slicing with indices greater than the length of the sequence would crash.
This commit is contained in:
Campbell Barton
2021-08-05 16:44:01 +10:00
parent 450593ddf0
commit 2b51124d6a
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/python/bmesh/bmesh_py_types_select.c
View File

@@ -205,7 +205,6 @@ static PyObject *bpy_bmeditselseq_subscript_slice(BPy_BMEditSelSeq *self,
Py_ssize_t stop) Py_ssize_t stop)
{ {
int count = 0; int count = 0;
bool ok;
PyObject *list; PyObject *list;
BMEditSelection *ese; BMEditSelection *ese;
@@ -214,30 +213,22 @@ static PyObject *bpy_bmeditselseq_subscript_slice(BPy_BMEditSelSeq *self,
list = PyList_New(0); list = PyList_New(0);
ese = self->bm->selected.first; /* First loop up-until the start. */
for (ese = self->bm->selected.first; ese; ese = ese->next) {
ok = (ese != NULL);
if (UNLIKELY(ok == false)) {
return list;
}
/* first loop up-until the start */
for (ok = true; ok; ok = ((ese = ese->next) != NULL)) {
if (count == start) { if (count == start) {
break; break;
} }
count++; count++;
} }
/* add items until stop */ /* Add items until stop. */
do { for (; ese; ese = ese->next) {
PyList_APPEND(list, BPy_BMElem_CreatePyObject(self->bm, &ese->ele->head)); PyList_APPEND(list, BPy_BMElem_CreatePyObject(self->bm, &ese->ele->head));
count++; count++;
if (count == stop) { if (count == stop) {
break; break;
} }
} while ((ese = ese->next)); }
return list; return list;
} }