fix crash with lots of operators when running "blender -d". Easy case to reproduce, just try to delete default cube.

Temporary hack to prevent crasher, likely caused by rev. 36242. 

1 files changed, 10 insertions, 3 deletions

diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index c9e2567a45b..b2ed914ea2b 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -1538,12 +1538,19 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
 		}
 		
 		/* modal ui handler can be tagged to be freed */ 
+		/* XXX TODO - handler was free'd in wm_handler_ui_call 
+		       and memory could be written to in BLI_remlink.
+			   As temporary solution preventing this by
+			   making sure handler is still in the list.
+		*/   
+		
 		if(handler->flag & WM_HANDLER_DO_FREE) {
-			BLI_remlink(handlers, handler);
-			wm_event_free_handler(handler);
+			if (BLI_findindex(handlers, handler) >= 0) {
+				BLI_remlink(handlers, handler);
+				wm_event_free_handler(handler);
+			}
 		}
 
-		
 		/* XXX fileread case */
 		if(CTX_wm_window(C)==NULL)
 			return action;