diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-08 17:03:04 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-08 17:03:04 +0400 |
commit | 85e53317be8f2d390752878dfc0a1aafc33df7ca (patch) | |
tree | 7ef81e83d7319fe4ac567759a932457179040acb /source/blender/windowmanager/intern | |
parent | 3fbaece0d63f9bf9826fee988624f195a8431fa4 (diff) |
fix for bug where notifiers could hold pointers to freed data which listeners would operate on.
Diffstat (limited to 'source/blender/windowmanager/intern')
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 21 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 626eeeadfe4..82ad87ed3b0 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -187,6 +187,27 @@ void WM_main_add_notifier(unsigned int type, void *reference) } } +/** + * Clear notifiers by reference, Used so listeners don't act on freed data. + */ +void WM_main_remove_notifier_reference(const void *reference) +{ + Main *bmain = G.main; + wmWindowManager *wm = bmain->wm.first; + if (wm) { + wmNotifier *note, *note_next; + + for (note = wm->queue.first; note; note = note_next) { + note_next = note->next; + + if (note->reference == reference) { + BLI_remlink(&wm->queue, note); + MEM_freeN(note); + } + } + } +} + static wmNotifier *wm_notifier_next(wmWindowManager *wm) { wmNotifier *note = wm->queue.first; diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 16afad88069..ccb463e59cb 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -145,6 +145,7 @@ void WM_init(bContext *C, int argc, const char **argv) WM_uilisttype_init(); set_free_windowmanager_cb(wm_close_and_free); /* library.c */ + set_free_notifier_reference_cb(WM_main_remove_notifier_reference); /* library.c */ set_blender_test_break_cb(wm_window_testbreak); /* blender.c */ DAG_editors_update_cb(ED_render_id_flush_update, ED_render_scene_update); /* depsgraph.c */ |