Bugfix with py operator api and modal operators. Modal operators would keep a reference to Reports locally allocated in the api functions, which would crash and burn later when the operator would actually stop.

This commit introduces a flag at the Reports level that can be used to indicate that it needs to be freed (on top of the flag already existing in the operator, which I guess could be removed).

Reports for operators called through python are only persisted if they indicate that they are running modal.

4 files changed, 17 insertions, 6 deletions

diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index 10f83c8b9ec..c3bbb759aff 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -80,6 +80,7 @@ typedef enum ReportType {
 enum ReportListFlags {
 	RPT_PRINT = 1,
 	RPT_STORE = 2,
+	RPT_FREE = 4,
 };
 typedef struct Report {
 	struct Report *next, *prev;
diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c
index 062db42e0e9..0c1d974c978 100644
--- a/source/blender/python/intern/bpy_operator.c
+++ b/source/blender/python/intern/bpy_operator.c
@@ -79,16 +79,21 @@ static PyObject *pyop_call( PyObject * self, PyObject * args)
 
 	
 	if (error_val==0) {
-		ReportList reports;
+		ReportList *reports;
 
-		BKE_reports_init(&reports, RPT_STORE);
+		reports= MEM_mallocN(sizeof(ReportList), "wmOperatorReportList");
+		BKE_reports_init(reports, RPT_STORE);
 
-		WM_operator_call_py(C, ot, context, &ptr, &reports);
+		WM_operator_call_py(C, ot, context, &ptr, reports);
 
-		if(BPy_reports_to_error(&reports))
+		if(BPy_reports_to_error(reports))
 			error_val = -1;
 
-		BKE_reports_clear(&reports);
+		BKE_reports_clear(reports);
+		if ((reports->flag & RPT_FREE) == 0)
+		{
+			MEM_freeN(reports);
+		}
 	}
 
 	WM_operator_properties_free(&ptr);
diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c
index 651394d51af..0a91c5078b7 100644
--- a/source/blender/windowmanager/intern/wm.c
+++ b/source/blender/windowmanager/intern/wm.c
@@ -69,7 +69,7 @@ void WM_operator_free(wmOperator *op)
 		MEM_freeN(op->properties);
 	}
 
-	if(op->reports && (op->flag & OPERATOR_REPORT_FREE)) {
+	if(op->reports && ((op->flag & OPERATOR_REPORT_FREE) || (op->reports->flag & RPT_FREE))) {
 		BKE_reports_clear(op->reports);
 		MEM_freeN(op->reports);
 	}
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 79441f33610..28814937ebe 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -555,6 +555,11 @@ int WM_operator_call_py(bContext *C, wmOperatorType *ot, int context, PointerRNA
 
 	retval= wm_operator_call_internal(C, ot, context, properties, reports);
 	
+	if (retval & OPERATOR_RUNNING_MODAL)
+	{
+		reports->flag |= RPT_FREE;
+	}
+	
 	return retval;
 }