forked from bartvdbraak/blender
Fix crash using removed data as function arguments
This commit is contained in:
parent
d0fcbab152
commit
db710e6c0d
@ -1830,25 +1830,23 @@ static int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyOb
|
||||
RNA_property_pointer_set(ptr, prop, param->ptr);
|
||||
}
|
||||
else {
|
||||
PointerRNA tmp;
|
||||
RNA_pointer_create(NULL, ptr_type, NULL, &tmp);
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"%.200s %.200s.%.200s expected a %.200s type. not %.200s",
|
||||
error_prefix, RNA_struct_identifier(ptr->type),
|
||||
RNA_property_identifier(prop), RNA_struct_identifier(tmp.type),
|
||||
RNA_struct_identifier(param->ptr.type));
|
||||
Py_XDECREF(value_new); return -1;
|
||||
raise_error = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (raise_error) {
|
||||
PointerRNA tmp;
|
||||
RNA_pointer_create(NULL, ptr_type, NULL, &tmp);
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"%.200s %.200s.%.200s expected a %.200s type, not %.200s",
|
||||
error_prefix, RNA_struct_identifier(ptr->type),
|
||||
RNA_property_identifier(prop), RNA_struct_identifier(tmp.type),
|
||||
RNA_struct_identifier(param->ptr.type));
|
||||
if (pyrna_struct_validity_check(param) == -1) {
|
||||
/* error set */
|
||||
}
|
||||
else {
|
||||
PointerRNA tmp;
|
||||
RNA_pointer_create(NULL, ptr_type, NULL, &tmp);
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"%.200s %.200s.%.200s expected a %.200s type, not %.200s",
|
||||
error_prefix, RNA_struct_identifier(ptr->type),
|
||||
RNA_property_identifier(prop), RNA_struct_identifier(tmp.type),
|
||||
RNA_struct_identifier(param->ptr.type));
|
||||
}
|
||||
Py_XDECREF(value_new); return -1;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user