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

py api: be more strict with boolean assignment, only accept 0 or 1, True/False. Would allow any nonzero value.

Browse Source
This commit is contained in:
Campbell Barton
2012-12-20 03:08:27 +00:00
parent 3bc3e178b3
commit 3c9f502049
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1510,12 +1510,18 @@ static int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyOb
/* prefer not to have an exception here
* however so many poll functions return None or a valid Object.
* its a hassle to convert these into a bool before returning, */
if (RNA_property_flag(prop) & PROP_OUTPUT)
if (RNA_property_flag(prop) & PROP_OUTPUT) {
param = PyObject_IsTrue(value);
else
}
else {
param = PyLong_AsLong(value);
if (param < 0) {
if (UNLIKELY(param & ~1)) { /* only accept 0/1 */
param = -1; /* error out below */
}
}
if (param == -1) {
PyErr_Format(PyExc_TypeError,
"%.200s %.200s.%.200s expected True/False or 0/1, not %.200s",
error_prefix, RNA_struct_identifier(ptr->type),