[Bf-blender-cvs] [d6d44faff06] master: Fix memory leak with Python RNA property get callback errors
Campbell Barton
noreply at git.blender.org
Tue Jul 27 17:15:29 CEST 2021
Commit: d6d44faff06dc7014e275d33d1be449ac62fcab6
Author: Campbell Barton
Date: Wed Jul 28 01:07:14 2021 +1000
Branches: master
https://developer.blender.org/rBd6d44faff06dc7014e275d33d1be449ac62fcab6
Fix memory leak with Python RNA property get callback errors
Failure to return a list of the expected size & type wasn't
decrementing the value, leaking a reference.
Caused by 127b5423d6203d521acb2b96b7de5534e8dbe79a a workaround for the
real error that was fixed f5e020a7a6ad6451fcaf075ae14f7014b8a4faea.
===================================================================
M source/blender/python/intern/bpy_props.c
===================================================================
diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c
index 0b812037810..c6d81c788ff 100644
--- a/source/blender/python/intern/bpy_props.c
+++ b/source/blender/python/intern/bpy_props.c
@@ -726,12 +726,8 @@ static void bpy_prop_boolean_array_get_fn(struct PointerRNA *ptr,
for (i = 0; i < len; i++) {
values[i] = false;
}
-
- /* PyC_AsArray decrements refcount internally on error */
- }
- else {
- Py_DECREF(ret);
}
+ Py_DECREF(ret);
}
if (use_gil) {
@@ -977,12 +973,8 @@ static void bpy_prop_int_array_get_fn(struct PointerRNA *ptr,
for (i = 0; i < len; i++) {
values[i] = 0;
}
-
- /* PyC_AsArray decrements refcount internally on error */
- }
- else {
- Py_DECREF(ret);
}
+ Py_DECREF(ret);
}
if (use_gil) {
@@ -1228,12 +1220,8 @@ static void bpy_prop_float_array_get_fn(struct PointerRNA *ptr,
for (i = 0; i < len; i++) {
values[i] = 0.0f;
}
-
- /* PyC_AsArray decrements refcount internally on error */
- }
- else {
- Py_DECREF(ret);
}
+ Py_DECREF(ret);
}
if (use_gil) {
More information about the Bf-blender-cvs
mailing list