From efcf36f2e9773f30fa6d4cce8fd0e793b9694b78 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Tue, 2 Nov 2021 07:59:10 -0500 Subject: 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 --- source/blender/python/generic/idprop_py_ui_api.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; } -- cgit v1.2.3