blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

ID Management Py API: Fix (unreported) crash in some cases. 

Would crash when passing some kind of invalid parameters, e.g.:

   >>>D.user_map(key_types={'brush'})
This commit is contained in:
Bastien Montagne 2019-02-18 16:55:32 +01:00
parent b8ec2c9559
commit 1414c4496c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/python/intern/bpy_rna_id_collection.c
View File

@ -170,6 +170,8 @@ static PyObject *bpy_user_map(PyObject *UNUSED(self), PyObject *args, PyObject *
PyObject *ret = NULL;
IDUserMapData data_cb = {NULL};
static const char *_keywords[] = {"subset", "key_types", "value_types", NULL};
static _PyArg_Parser _parser = {"|O$O!O!:user_map", _keywords, 0};
if (!_PyArg_ParseTupleAndKeywordsFast(
@ -197,8 +199,6 @@ static PyObject *bpy_user_map(PyObject *UNUSED(self), PyObject *args, PyObject *
}
}
IDUserMapData data_cb = {NULL};
if (subset) {
PyObject *subset_fast = PySequence_Fast(subset, "user_map");
if (subset_fast == NULL) {
@ -268,13 +268,15 @@ static PyObject *bpy_user_map(PyObject *UNUSED(self), PyObject *args, PyObject *
ret = data_cb.user_map;
error:
Py_XDECREF(data_cb.py_id_key_lookup_only);
if (data_cb.py_id_key_lookup_only != NULL) {
Py_XDECREF(data_cb.py_id_key_lookup_only);
}
if (key_types_bitmap) {
if (key_types_bitmap != NULL) {
MEM_freeN(key_types_bitmap);
}
if (val_types_bitmap) {
if (val_types_bitmap != NULL) {
MEM_freeN(val_types_bitmap);
}