[Bf-blender-cvs] [2492d9852bb] master: Fix memory leak in Context.temp_override
Campbell Barton
noreply at git.blender.org
Tue Apr 26 08:51:31 CEST 2022
Commit: 2492d9852bb33aa7209f0a297a117488b0a39cfd
Author: Campbell Barton
Date: Tue Apr 26 16:48:34 2022 +1000
Branches: master
https://developer.blender.org/rB2492d9852bb33aa7209f0a297a117488b0a39cfd
Fix memory leak in Context.temp_override
Add missing check as the context override dict may have been copied
since it was assigned, also initialize the context manager with
PyType_Ready, while it didn't cause any errors - it's expected
that all types are initialized.
===================================================================
M source/blender/python/intern/bpy_rna_context.c
M source/blender/python/intern/bpy_rna_context.h
M source/blender/python/intern/bpy_rna_types_capi.c
===================================================================
diff --git a/source/blender/python/intern/bpy_rna_context.c b/source/blender/python/intern/bpy_rna_context.c
index 811552ce938..1d033fee026 100644
--- a/source/blender/python/intern/bpy_rna_context.c
+++ b/source/blender/python/intern/bpy_rna_context.c
@@ -143,6 +143,11 @@ static PyObject *bpy_rna_context_temp_override_exit(BPyContextTempOverride *self
}
}
+ /* A copy may have been made when writing context members, see #BPY_context_dict_clear_members */
+ PyObject *context_dict_test = CTX_py_dict_get(C);
+ if (context_dict_test && (context_dict_test != self->py_state_context_dict)) {
+ Py_DECREF(context_dict_test);
+ }
CTX_py_state_pop(C, &self->py_state);
Py_CLEAR(self->py_state_context_dict);
@@ -304,3 +309,11 @@ PyMethodDef BPY_rna_context_temp_override_method_def = {
METH_VARARGS | METH_KEYWORDS,
bpy_context_temp_override_doc,
};
+
+void bpy_rna_context_types_init(void)
+{
+ if (PyType_Ready(&BPyContextTempOverride_Type) < 0) {
+ BLI_assert_unreachable();
+ return;
+ }
+}
diff --git a/source/blender/python/intern/bpy_rna_context.h b/source/blender/python/intern/bpy_rna_context.h
index ddd328131e6..c69ac15a352 100644
--- a/source/blender/python/intern/bpy_rna_context.h
+++ b/source/blender/python/intern/bpy_rna_context.h
@@ -12,6 +12,8 @@ extern "C" {
extern PyMethodDef BPY_rna_context_temp_override_method_def;
+void bpy_rna_context_types_init(void);
+
#ifdef __cplusplus
}
#endif
diff --git a/source/blender/python/intern/bpy_rna_types_capi.c b/source/blender/python/intern/bpy_rna_types_capi.c
index 376195ab845..608692876d6 100644
--- a/source/blender/python/intern/bpy_rna_types_capi.c
+++ b/source/blender/python/intern/bpy_rna_types_capi.c
@@ -268,6 +268,8 @@ void BPY_rna_types_extend_capi(void)
&RNA_WindowManager, pyrna_windowmanager_methods, pyrna_windowmanager_getset);
/* Context */
+ bpy_rna_context_types_init();
+
ARRAY_SET_ITEMS(pyrna_context_methods, BPY_rna_context_temp_override_method_def);
pyrna_struct_type_extend_capi(&RNA_Context, pyrna_context_methods, NULL);
}
More information about the Bf-blender-cvs
mailing list