brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MetaIdleMonitor: protect the monitor instance while calling destroy notify

Browse Source 
The destroy notify for a DBus watch holds a reference to the IdleMonitor,
but the IdleMonitorWatch object doesn't (it knows all watches will
be destroyed before the monitor is, so it doesn't need one). This
means that the DBus watch reference can be the only one keeping
the IdleMonitor alive (expecially true for device idle monitors,
which are only used by g-s-d/cursor), and that means that calling
the destroy notify freezes the monitor (and the next X calls
access garbage).

https://bugzilla.gnome.org/show_bug.cgi?id=708420
This commit is contained in:
Giovanni Campagna 2013-09-20 14:25:34 +02:00
parent 52e2a1226e
commit 348f3007d9
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,6 +293,7 @@ idle_monitor_watch_free (MetaIdleMonitorWatch *watch)
return; return;
monitor = watch->monitor; monitor = watch->monitor;
g_object_ref (monitor);
if (watch->idle_source_id) if (watch->idle_source_id)
{ {
@ -313,6 +314,7 @@ idle_monitor_watch_free (MetaIdleMonitorWatch *watch)
if (watch->timeout_source != NULL) if (watch->timeout_source != NULL)
g_source_destroy (watch->timeout_source); g_source_destroy (watch->timeout_source);
g_object_unref (monitor);
g_slice_free (MetaIdleMonitorWatch, watch); g_slice_free (MetaIdleMonitorWatch, watch);
} }