From 3c09beb3b1f785c920eed3d61f7c2a2a06deba50 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 14 May 2021 19:18:50 +1000 Subject: Fix memory leak in IDPropertyGroup.pop() When popping ID-property groups/arrays, ID-property was removed but not freed. Now the value is converted to a native Python type and freed. --- source/blender/python/generic/idprop_py_api.c | 4 ++-- source/blender/python/generic/idprop_py_api.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'source/blender/python/generic') diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c index 75fd63e16f9..fc7054f675a 100644 --- a/source/blender/python/generic/idprop_py_api.c +++ b/source/blender/python/generic/idprop_py_api.c @@ -766,7 +766,7 @@ static PyObject *BPy_IDGroup_iter(BPy_IDProperty *self) } /* for simple, non nested types this is the same as BPy_IDGroup_WrapData */ -static PyObject *BPy_IDGroup_MapDataToPy(IDProperty *prop) +PyObject *BPy_IDGroup_MapDataToPy(IDProperty *prop) { switch (prop->type) { case IDP_STRING: @@ -919,7 +919,7 @@ static PyObject *BPy_IDGroup_pop(BPy_IDProperty *self, PyObject *args) return NULL; } - IDP_RemoveFromGroup(self->prop, idprop); + IDP_FreeFromGroup(self->prop, idprop); return pyform; } diff --git a/source/blender/python/generic/idprop_py_api.h b/source/blender/python/generic/idprop_py_api.h index 991ae7be9c9..4cccea3a936 100644 --- a/source/blender/python/generic/idprop_py_api.h +++ b/source/blender/python/generic/idprop_py_api.h @@ -60,6 +60,7 @@ PyObject *BPy_Wrap_GetValues(struct ID *id, struct IDProperty *prop); PyObject *BPy_Wrap_GetItems(struct ID *id, struct IDProperty *prop); int BPy_Wrap_SetMapItem(struct IDProperty *prop, PyObject *key, PyObject *val); +PyObject *BPy_IDGroup_MapDataToPy(struct IDProperty *prop); PyObject *BPy_IDGroup_WrapData(struct ID *id, struct IDProperty *prop, struct IDProperty *parent); bool BPy_IDProperty_Map_ValidateAndCreate(PyObject *key, struct IDProperty *group, PyObject *ob); -- cgit v1.2.3