[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51651] trunk/blender/source/blender: fix for crash when a python operator or render engine was freed in the C code and then referenced from python .
Campbell Barton
ideasman42 at gmail.com
Fri Oct 26 12:33:58 CEST 2012
Revision: 51651
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51651
Author: campbellbarton
Date: 2012-10-26 10:33:57 +0000 (Fri, 26 Oct 2012)
Log Message:
-----------
fix for crash when a python operator or render engine was freed in the C code and then referenced from python.
now further access in python gives an exception at the line when the freed data is accessed.
Modified Paths:
--------------
trunk/blender/source/blender/python/BPY_extern.h
trunk/blender/source/blender/python/intern/bpy_interface.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/python/intern/bpy_rna.h
trunk/blender/source/blender/render/intern/source/external_engine.c
trunk/blender/source/blender/windowmanager/intern/wm.c
Modified: trunk/blender/source/blender/python/BPY_extern.h
===================================================================
--- trunk/blender/source/blender/python/BPY_extern.h 2012-10-26 09:55:19 UTC (rev 51650)
+++ trunk/blender/source/blender/python/BPY_extern.h 2012-10-26 10:33:57 UTC (rev 51651)
@@ -80,6 +80,7 @@
int BPY_string_exec(struct bContext *C, const char *expr);
void BPY_DECREF(void *pyob_ptr); /* Py_DECREF() */
+void BPY_RNA_DECREF_INVALIDATE(void *pyob_ptr);
int BPY_context_member_get(struct bContext *C, const char *member, struct bContextDataResult *result);
void BPY_context_set(struct bContext *C);
void BPY_context_update(struct bContext *C);
Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c 2012-10-26 09:55:19 UTC (rev 51650)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c 2012-10-26 10:33:57 UTC (rev 51651)
@@ -510,6 +510,18 @@
PyGILState_Release(gilstate);
}
+void BPY_RNA_DECREF_INVALIDATE(void *pyob_ptr)
+{
+ PyGILState_STATE gilstate = PyGILState_Ensure();
+ const int do_invalidate = (Py_REFCNT((PyObject *)pyob_ptr) > 1);
+ Py_DECREF((PyObject *)pyob_ptr);
+ if (do_invalidate) {
+ pyrna_invalidate(pyob_ptr);
+ }
+ PyGILState_Release(gilstate);
+}
+
+
/* return -1 on error, else 0 */
int BPY_button_exec(bContext *C, const char *expr, double *value, const short verbose)
{
Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c 2012-10-26 09:55:19 UTC (rev 51650)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c 2012-10-26 10:33:57 UTC (rev 51651)
@@ -119,13 +119,11 @@
return -1;
}
-#if defined(USE_PYRNA_INVALIDATE_GC) || defined(USE_PYRNA_INVALIDATE_WEAKREF)
-static void pyrna_invalidate(BPy_DummyPointerRNA *self)
+void pyrna_invalidate(BPy_DummyPointerRNA *self)
{
self->ptr.type = NULL; /* this is checked for validity */
self->ptr.id.data = NULL; /* should not be needed but prevent bad pointer access, just in case */
}
-#endif
#ifdef USE_PYRNA_INVALIDATE_GC
#define FROM_GC(g) ((PyObject *)(((PyGC_Head *)g) + 1))
Modified: trunk/blender/source/blender/python/intern/bpy_rna.h
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.h 2012-10-26 09:55:19 UTC (rev 51650)
+++ trunk/blender/source/blender/python/intern/bpy_rna.h 2012-10-26 10:33:57 UTC (rev 51651)
@@ -207,6 +207,7 @@
int pyrna_write_check(void);
void pyrna_write_set(int val);
+void pyrna_invalidate(BPy_DummyPointerRNA *self);
int pyrna_struct_validity_check(BPy_StructRNA *pysrna);
int pyrna_prop_validity_check(BPy_PropertyRNA *self);
Modified: trunk/blender/source/blender/render/intern/source/external_engine.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/external_engine.c 2012-10-26 09:55:19 UTC (rev 51650)
+++ trunk/blender/source/blender/render/intern/source/external_engine.c 2012-10-26 10:33:57 UTC (rev 51651)
@@ -138,7 +138,7 @@
{
#ifdef WITH_PYTHON
if (engine->py_instance) {
- BPY_DECREF(engine->py_instance);
+ BPY_RNA_DECREF_INVALIDATE(engine->py_instance);
}
#endif
Modified: trunk/blender/source/blender/windowmanager/intern/wm.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm.c 2012-10-26 09:55:19 UTC (rev 51650)
+++ trunk/blender/source/blender/windowmanager/intern/wm.c 2012-10-26 10:33:57 UTC (rev 51651)
@@ -78,7 +78,7 @@
if (op->py_instance) {
/* do this first in case there are any __del__ functions or
* similar that use properties */
- BPY_DECREF(op->py_instance);
+ BPY_RNA_DECREF_INVALIDATE(op->py_instance);
}
#endif
More information about the Bf-blender-cvs
mailing list