isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 19:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

idle-monitor: Fix a warning when a callback removes the user active watch

Browse Source 
The user active watch is a one-fire watch, but it is valid in the API
for the callback to explicitly remove the watch itself. In that case,
the watch will be invalid after the user removes it, and the memory
potentially freed. So make sure to not dereference the watch after
the callback is called.

https://bugzilla.gnome.org/show_bug.cgi?id=706825
This commit is contained in:
Jasper St. Pierre 2013-08-26 16:22:08 -04:00 committed by Giovanni Campagna
parent ab72352c47
commit 6526e9882b
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/meta-idle-monitor.c
View File

@ -110,19 +110,20 @@ static void
fire_watch (MetaIdleMonitorWatch *watch) fire_watch (MetaIdleMonitorWatch *watch)
{ {
MetaIdleMonitor *monitor; MetaIdleMonitor *monitor;
guint id;
gboolean is_user_active_watch;
monitor = watch->monitor; monitor = watch->monitor;
g_object_ref (monitor); g_object_ref (monitor);
if (watch->callback) id = watch->id;
{ is_user_active_watch = (watch->timeout_msec == 0);
watch->callback (watch->monitor,
watch->id,
watch->user_data);
}
if (watch->timeout_msec == 0) if (watch->callback)
meta_idle_monitor_remove_watch (watch->monitor, watch->id); watch->callback (monitor, id, watch->user_data);
if (is_user_active_watch)
meta_idle_monitor_remove_watch (monitor, id);
g_object_unref (monitor); g_object_unref (monitor);
} }