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

bugfix for reading invalid id prop lengths from python.

Browse Source
This commit is contained in:
Campbell Barton
2010-02-01 18:38:33 +00:00
parent 46b0e90cf6
commit 7fe3ab7e8e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/python/generic/IDProp.c
View File

@@ -480,10 +480,13 @@ PyObject *BPy_Wrap_GetKeys(IDProperty *prop)
IDProperty *loop; IDProperty *loop;
int i; int i;
for (i=0, loop=prop->data.group.first; loop; loop=loop->next, i++) for (i=0, loop=prop->data.group.first; loop && (i < prop->len); loop=loop->next, i++)
PyList_SET_ITEM(seq, i, PyUnicode_FromString(loop->name)); PyList_SET_ITEM(seq, i, PyUnicode_FromString(loop->name));
if (i != prop->len) { /* if the id prop is corrupt, count the remaining */
for (; loop; loop=loop->next, i++) {}
if (i != prop->len) { /* if the loop didnt finish, we know the length is wrong */
BPy_IDGroup_CorrectListLen(prop, seq, i); BPy_IDGroup_CorrectListLen(prop, seq, i);
Py_DECREF(seq); /*free the list*/ Py_DECREF(seq); /*free the list*/
/*call self again*/ /*call self again*/