diff options
author | Ray Strode <rstrode@redhat.com> | 2016-01-07 13:02:04 -0500 |
---|---|---|
committer | Ray Strode <rstrode@redhat.com> | 2016-01-11 11:23:39 -0500 |
commit | 42b3a34f7b79c3708de9e9e41d567f3c217dd752 (patch) | |
tree | e1ee15623232617e3b0bea29a1acf26a92a3ee54 | |
parent | 19d814c8876cfc0f9eec78d0cf60d6d6c8e5fb34 (diff) | |
download | mutter-42b3a34f7b79c3708de9e9e41d567f3c217dd752.tar.gz |
idle-monitor-xsync: fix crash if watch callback removes different watch
Right now the XSync based idle monitoring code, will fetch all active
watches into a list, and then call their watch callbacks one by one
as necessary. If one watch callback invalidates another watch, the
list will contain free'd memory.
This commit makes sure to consult the hash table after ever call
of a watch callback, to ensure mutter never looks at freed memory.
Fixes crash reported on IRC by Laine Stump with his synergy setup.
https://bugzilla.gnome.org/show_bug.cgi?id=760330
-rw-r--r-- | src/backends/x11/meta-idle-monitor-xsync.c | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/src/backends/x11/meta-idle-monitor-xsync.c b/src/backends/x11/meta-idle-monitor-xsync.c index e2dd4139f..de25312ad 100644 --- a/src/backends/x11/meta-idle-monitor-xsync.c +++ b/src/backends/x11/meta-idle-monitor-xsync.c @@ -107,20 +107,6 @@ set_alarm_enabled (Display *dpy, XSyncChangeAlarm (dpy, alarm, XSyncCAEvents, &attr); } -static void -check_x11_watch (gpointer data, - gpointer user_data) -{ - MetaIdleMonitorWatchXSync *watch_xsync = data; - MetaIdleMonitorWatch *watch = (MetaIdleMonitorWatch *) watch_xsync; - XSyncAlarm alarm = (XSyncAlarm) user_data; - - if (watch_xsync->xalarm != alarm) - return; - - _meta_idle_monitor_watch_fire (watch); -} - static char * counter_name_for_device (int device_id) { @@ -327,13 +313,38 @@ meta_idle_monitor_xsync_init (MetaIdleMonitorXSync *monitor_xsync) monitor_xsync->alarms = g_hash_table_new (NULL, NULL); } +static void +check_x11_watches (MetaIdleMonitor *monitor, + XSyncAlarm alarm) +{ + GList *node, *watch_ids; + + /* we get the keys and do explicit look ups in case + * an early iteration of the loop ends up leading + * to watches from later iterations getting invalidated + */ + watch_ids = g_hash_table_get_keys (monitor->watches); + + for (node = watch_ids; node != NULL; node = node->next) + { + guint watch_id = GPOINTER_TO_UINT (node->data); + MetaIdleMonitorWatchXSync *watch; + + watch = g_hash_table_lookup (monitor->watches, GUINT_TO_POINTER (watch_id)); + + if (watch && watch->xalarm == alarm) + _meta_idle_monitor_watch_fire ((MetaIdleMonitorWatch *) watch); + } + + g_list_free (watch_ids); +} + void meta_idle_monitor_xsync_handle_xevent (MetaIdleMonitor *monitor, XSyncAlarmNotifyEvent *alarm_event) { MetaIdleMonitorXSync *monitor_xsync = META_IDLE_MONITOR_XSYNC (monitor); XSyncAlarm alarm; - GList *watches; gboolean has_alarm; if (alarm_event->state != XSyncAlarmActive) @@ -358,10 +369,5 @@ meta_idle_monitor_xsync_handle_xevent (MetaIdleMonitor *monitor, } if (has_alarm) - { - watches = g_hash_table_get_values (monitor->watches); - - g_list_foreach (watches, check_x11_watch, (gpointer) alarm); - g_list_free (watches); - } + check_x11_watches (monitor, alarm); } |