[Bf-blender-cvs] [efcf36f2e97] blender-v3.0-release: Fix T92532: Missing null checks in IDPropertyManager.update_from
Hans Goudey
noreply at git.blender.org
Tue Nov 2 13:59:27 CET 2021
Commit: efcf36f2e9773f30fa6d4cce8fd0e793b9694b78
Author: Hans Goudey
Date: Tue Nov 2 07:59:10 2021 -0500
Branches: blender-v3.0-release
https://developer.blender.org/rBefcf36f2e9773f30fa6d4cce8fd0e793b9694b78
Fix T92532: Missing null checks in IDPropertyManager.update_from
Calling it with a None argument, or no arguments, or with a property
that is missing UI data for some reason would fail. There is no
particular reason why ensuring those things don't happen is helpful,
so just add null checks for safety.
Differential Revision: https://developer.blender.org/D13024
===================================================================
M source/blender/python/generic/idprop_py_ui_api.c
===================================================================
diff --git a/source/blender/python/generic/idprop_py_ui_api.c b/source/blender/python/generic/idprop_py_ui_api.c
index 7827bd48dfe..37ba27f7315 100644
--- a/source/blender/python/generic/idprop_py_ui_api.c
+++ b/source/blender/python/generic/idprop_py_ui_api.c
@@ -622,7 +622,9 @@ static PyObject *BPy_IDPropertyUIManager_update_from(BPy_IDPropertyUIManager *se
IDP_ui_data_free(property);
}
- property->ui_data = IDP_ui_data_copy(ui_manager_src->property);
+ if (ui_manager_src->property && ui_manager_src->property->ui_data) {
+ property->ui_data = IDP_ui_data_copy(ui_manager_src->property);
+ }
Py_RETURN_NONE;
}
More information about the Bf-blender-cvs
mailing list